← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Brian Aker
  • Date: 2010-12-25 04:38:28 UTC
  • mto: This revision was merged to the branch mainline in revision 2031.
  • Revision ID: brian@tangent.org-20101225043828-fz83ma79dvqaxvri
Update for moving DRIZZLE_TIME to type::Time

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;