← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field.cc

  • Committer: Monty Taylor
  • Date: 2008-09-22 23:10:15 UTC
  • mto: This revision was merged to the branch mainline in revision 417.
  • Revision ID: monty@inaugust.com-20080922231015-opvz2pv1hs340y2f
Remove typedef enum enum_drizzle_timestamp_type timestamp_type;

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field.cc
1200
1200
*/
1201
1201
 
1202
1202
int Field::store_time(DRIZZLE_TIME *ltime,
1203
 
                      timestamp_type type_arg __attribute__((unused)))
 
1203
                      enum enum_drizzle_timestamp_type type_arg __attribute__((unused)))
1204
1204
{
1205
1205
  char buff[MAX_DATE_STRING_REP_LENGTH];
1206
1206
  uint length= (uint) my_TIME_to_str(ltime, buff);
2556
2556
Field::set_datetime_warning(DRIZZLE_ERROR::enum_warning_level level, 
2557
2557
                            unsigned int code, 
2558
2558
                            const char *str, uint str_length, 
2559
 
                            timestamp_type ts_type, int cuted_increment)
 
2559
                            enum enum_drizzle_timestamp_type ts_type, int cuted_increment)
2560
2560
{
2561
2561
  THD *thd= table ? table->in_use : current_thd;
2562
2562
  if ((thd->really_abort_on_warning() &&
2584
2584
 
2585
2585
void 
2586
2586
Field::set_datetime_warning(DRIZZLE_ERROR::enum_warning_level level, uint code, 
2587
 
                            int64_t nr, timestamp_type ts_type,
 
2587
                            int64_t nr, enum enum_drizzle_timestamp_type ts_type,
2588
2588
                            int cuted_increment)
2589
2589
{
2590
2590
  THD *thd= table ? table->in_use : current_thd;
2615
2615
 
2616
2616
void 
2617
2617
Field::set_datetime_warning(DRIZZLE_ERROR::enum_warning_level level, uint code, 
2618
 
                            double nr, timestamp_type ts_type)
 
2618
                            double nr, enum enum_drizzle_timestamp_type ts_type)
2619
2619
{
2620
2620
  THD *thd= table ? table->in_use : current_thd;
2621
2621
  if (thd->really_abort_on_warning() ||