← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/server_includes.h

  • 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/server_includes.h
858
858
                         uint *day);
859
859
my_time_t TIME_to_timestamp(THD *thd, const DRIZZLE_TIME *t, bool *not_exist);
860
860
bool str_to_time_with_warn(const char *str,uint length,DRIZZLE_TIME *l_time);
861
 
timestamp_type str_to_datetime_with_warn(const char *str, uint length,
 
861
enum enum_drizzle_timestamp_type str_to_datetime_with_warn(const char *str, uint length,
862
862
                                         DRIZZLE_TIME *l_time, uint flags);
863
863
void localtime_to_TIME(DRIZZLE_TIME *to, struct tm *from);
864
864
void calc_time_from_sec(DRIZZLE_TIME *to, long seconds, long microseconds);
865
865
 
866
866
void make_truncated_value_warning(THD *thd, DRIZZLE_ERROR::enum_warning_level level,
867
867
                                  const char *str_val,
868
 
                                  uint str_length, timestamp_type time_type,
 
868
                                  uint str_length, enum enum_drizzle_timestamp_type time_type,
869
869
                                  const char *field_name);
870
870
 
871
871
bool date_add_interval(DRIZZLE_TIME *ltime, interval_type int_type, INTERVAL interval);
874
874
 
875
875
extern LEX_STRING interval_type_to_name[];
876
876
 
877
 
extern DATE_TIME_FORMAT *date_time_format_make(timestamp_type format_type,
 
877
extern DATE_TIME_FORMAT *date_time_format_make(enum enum_drizzle_timestamp_type format_type,
878
878
                                               const char *format_str,
879
879
                                               uint format_length);
880
880
extern DATE_TIME_FORMAT *date_time_format_copy(THD *thd,
881
881
                                               DATE_TIME_FORMAT *format);
882
882
const char *get_date_time_format_str(KNOWN_DATE_TIME_FORMAT *format,
883
 
                                     timestamp_type type);
 
883
                                                             enum enum_drizzle_timestamp_type type);
884
884
extern bool make_date_time(DATE_TIME_FORMAT *format, DRIZZLE_TIME *l_time,
885
 
                           timestamp_type type, String *str);
 
885
                                             enum enum_drizzle_timestamp_type type, String *str);
886
886
void make_datetime(const DATE_TIME_FORMAT *format, const DRIZZLE_TIME *l_time,
887
887
                   String *str);
888
888
void make_date(const DATE_TIME_FORMAT *format, const DRIZZLE_TIME *l_time,