← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item_timefunc.h

  • Committer: Monty Taylor
  • Date: 2008-11-15 17:58:57 UTC
  • mfrom: (575.5.1 drizzle)
  • mto: (589.1.3 devel)
  • mto: This revision was merged to the branch mainline in revision 586.
  • Revision ID: monty@inaugust.com-20081115175857-kxdeopxzbyyz5bkd
Merged from David.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item_timefunc.h
246
246
  bool get_date(DRIZZLE_TIME *ltime, uint32_t fuzzy_date);
247
247
  bool get_time(DRIZZLE_TIME *ltime);
248
248
  const char *cast_type() const { return "date"; }
249
 
  enum_field_types field_type() const { return DRIZZLE_TYPE_NEWDATE; }
 
249
  enum_field_types field_type() const { return DRIZZLE_TYPE_DATE; }
250
250
  Field *tmp_table_field(Table *table)
251
251
  {
252
252
    return tmp_table_field_from_field_type(table, 0);
343
343
  Item_func_makedate(Item *a,Item *b) :Item_date_func(a,b) {}
344
344
  String *val_str(String *str);
345
345
  const char *func_name() const { return "makedate"; }
346
 
  enum_field_types field_type() const { return DRIZZLE_TYPE_NEWDATE; }
 
346
  enum_field_types field_type() const { return DRIZZLE_TYPE_DATE; }
347
347
  void fix_length_and_dec()
348
348
  { 
349
349
    decimals=0;