← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/time.cc

  • Committer: Monty Taylor
  • Date: 2008-10-02 01:31:53 UTC
  • mfrom: (398.1.6 codestyle-new)
  • Revision ID: monty@inaugust.com-20081002013153-b097om921cd3j1pn
Merged from stdint-includes-fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/time.cc
216
216
    See description of str_to_datetime() for more information.
217
217
*/
218
218
 
219
 
timestamp_type
 
219
enum enum_drizzle_timestamp_type
220
220
str_to_datetime_with_warn(const char *str, uint length, DRIZZLE_TIME *l_time,
221
221
                          uint flags)
222
222
{
223
223
  int was_cut;
224
224
  THD *thd= current_thd;
225
 
  timestamp_type ts_type;
 
225
  enum enum_drizzle_timestamp_type ts_type;
226
226
  
227
227
  ts_type= str_to_datetime(str, length, l_time,
228
228
                           (flags | (thd->variables.sql_mode &
348
348
    1   error
349
349
*/
350
350
 
351
 
bool parse_date_time_format(timestamp_type format_type, 
 
351
bool parse_date_time_format(enum enum_drizzle_timestamp_type format_type, 
352
352
                            const char *format, uint format_length,
353
353
                            DATE_TIME_FORMAT *date_time_format)
354
354
{
580
580
*/
581
581
 
582
582
DATE_TIME_FORMAT
583
 
*date_time_format_make(timestamp_type format_type,
 
583
*date_time_format_make(enum enum_drizzle_timestamp_type format_type,
584
584
                       const char *format_str, uint format_length)
585
585
{
586
586
  DATE_TIME_FORMAT tmp;
656
656
*/
657
657
 
658
658
const char *get_date_time_format_str(KNOWN_DATE_TIME_FORMAT *format,
659
 
                                     timestamp_type type)
 
659
                                     enum enum_drizzle_timestamp_type type)
660
660
{
661
661
  switch (type) {
662
662
  case DRIZZLE_TIMESTAMP_DATE:
715
715
 
716
716
void make_truncated_value_warning(THD *thd, DRIZZLE_ERROR::enum_warning_level level,
717
717
                                  const char *str_val,
718
 
                                  uint str_length, timestamp_type time_type,
 
718
                                  uint str_length,
 
719
                                  enum enum_drizzle_timestamp_type time_type,
719
720
                                  const char *field_name)
720
721
{
721
722
  char warn_buff[DRIZZLE_ERRMSG_SIZE];