← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/time/period_add.cc

  • Committer: Brian Aker
  • Date: 2009-02-26 05:21:02 UTC
  • mfrom: (896.1.5 fix-osxs)
  • Revision ID: brian@intel-mini-2.local-20090226052102-8xtbjt8kph6mi0qx
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/period_add.cc
24
24
int64_t Item_func_period_add::val_int()
25
25
{
26
26
  assert(fixed == 1);
27
 
  uint32_t period= args[0]->val_int();
 
27
  uint32_t period= (uint32_t)args[0]->val_int();
28
28
  int months=(int) args[1]->val_int();
29
29
 
30
30
  if ((null_value=args[0]->null_value || args[1]->null_value) ||