← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: David Shrewsbury
  • Date: 2011-01-13 18:43:55 UTC
  • mto: (2081.1.2 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2082.
  • Revision ID: shrewsbury.dave@gmail.com-20110113184355-wsmu0grg7tkxwdsc
https://launchpad.net/bugs/614061
Push ALTER SCHEMA through replication stream as proper GPB message instead of RAW_SQL.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/makedate.cc
38
38
String *Item_func_makedate::val_str(String *str)
39
39
{
40
40
  assert(fixed == 1);
41
 
  DRIZZLE_TIME l_time;
 
41
  type::Time l_time;
42
42
  long daynr=  (long) args[1]->val_int();
43
43
  long year= (long) args[0]->val_int();
44
44
  long days;
81
81
int64_t Item_func_makedate::val_int()
82
82
{
83
83
  assert(fixed == 1);
84
 
  DRIZZLE_TIME l_time;
 
84
  type::Time l_time;
85
85
  long daynr=  (long) args[1]->val_int();
86
86
  long year= (long) args[0]->val_int();
87
87
  long days;