← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item_timefunc.cc

merge latest from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item_timefunc.cc
889
889
int64_t Item_func_period_add::val_int()
890
890
{
891
891
  assert(fixed == 1);
892
 
  ulong period=(ulong) args[0]->val_int();
 
892
  uint32_t period= args[0]->val_int();
893
893
  int months=(int) args[1]->val_int();
894
894
 
895
895
  if ((null_value=args[0]->null_value || args[1]->null_value) ||
904
904
int64_t Item_func_period_diff::val_int()
905
905
{
906
906
  assert(fixed == 1);
907
 
  ulong period1=(ulong) args[0]->val_int();
908
 
  ulong period2=(ulong) args[1]->val_int();
 
907
  uint32_t period1= args[0]->val_int();
 
908
  uint32_t period2= args[1]->val_int();
909
909
 
910
910
  if ((null_value=args[0]->null_value || args[1]->null_value))
911
911
    return 0; /* purecov: inspected */