← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Brian Aker
  • Date: 2010-12-27 19:18:58 UTC
  • mfrom: (2035 staging)
  • mto: (2035.1.1 clean)
  • mto: This revision was merged to the branch mainline in revision 2037.
  • Revision ID: brian@tangent.org-20101227191858-h11rg8ncrkiklg3f
Manage merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/date_format.cc
35
35
  Create a formated date/time value in a string.
36
36
*/
37
37
 
38
 
static bool make_date_time(String *format, DRIZZLE_TIME *l_time,
 
38
static bool make_date_time(String *format, type::Time *l_time,
39
39
                           enum enum_drizzle_timestamp_type type, String *str)
40
40
{
41
41
  char intbuff[15];
386
386
String *Item_func_date_format::val_str(String *str)
387
387
{
388
388
  String *format;
389
 
  DRIZZLE_TIME l_time;
 
389
  type::Time l_time;
390
390
  uint32_t size;
391
391
  assert(fixed == 1);
392
392