← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/item_func.cc

Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/item_func.cc
1753
1753
    return 0;
1754
1754
  }
1755
1755
  null_value=0;
1756
 
  return (shift < sizeof(longlong)*8 ? (longlong) res : LL(0));
 
1756
  return (shift < sizeof(longlong)*8 ? (longlong) res : 0LL);
1757
1757
}
1758
1758
 
1759
1759
longlong Item_func_shift_right::val_int()
1768
1768
    return 0;
1769
1769
  }
1770
1770
  null_value=0;
1771
 
  return (shift < sizeof(longlong)*8 ? (longlong) res : LL(0));
 
1771
  return (shift < sizeof(longlong)*8 ? (longlong) res : 0LL);
1772
1772
}
1773
1773
 
1774
1774
 
2682
2682
                              find->length(), 0);
2683
2683
        enum_bit=0;
2684
2684
        if (enum_value)
2685
 
          enum_bit=LL(1) << (enum_value-1);
 
2685
          enum_bit=1LL << (enum_value-1);
2686
2686
      }
2687
2687
    }
2688
2688
  }
2753
2753
               wc == (my_wc_t) separator)
2754
2754
        return (longlong) ++position;
2755
2755
      else
2756
 
        return LL(0);
 
2756
        return 0LL;
2757
2757
    }
2758
2758
  }
2759
2759
  return 0;
3711
3711
longlong user_var_entry::val_int(my_bool *null_value) const
3712
3712
{
3713
3713
  if ((*null_value= (value == 0)))
3714
 
    return LL(0);
 
3714
    return 0LL;
3715
3715
 
3716
3716
  switch (type) {
3717
3717
  case REAL_RESULT:
3733
3733
    DBUG_ASSERT(1);                             // Impossible
3734
3734
    break;
3735
3735
  }
3736
 
  return LL(0);                                 // Impossible
 
3736
  return 0LL;                                   // Impossible
3737
3737
}
3738
3738
 
3739
3739
 
4167
4167
{
4168
4168
  DBUG_ASSERT(fixed == 1);
4169
4169
  if (!var_entry)
4170
 
    return LL(0);                               // No such variable
 
4170
    return 0LL;                         // No such variable
4171
4171
  return (var_entry->val_int(&null_value));
4172
4172
}
4173
4173