← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Monty Taylor
  • Date: 2008-07-31 18:25:59 UTC
  • mto: (202.3.5 gettextize)
  • mto: This revision was merged to the branch mainline in revision 243.
  • Revision ID: monty@inaugust.com-20080731182559-txjt9f3dfhusxfp8
Renamed MYSQL_TIME to DRIZZLE_TIME.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
3499
3499
   0, GET_ULONG, REQUIRED_ARG, CONNECT_TIMEOUT, 2, LONG_TIMEOUT, 0, 1, 0 },
3500
3500
  { "date_format", OPT_DATE_FORMAT,
3501
3501
    "The DATE format (For future).",
3502
 
    (char**) &opt_date_time_formats[MYSQL_TIMESTAMP_DATE],
3503
 
    (char**) &opt_date_time_formats[MYSQL_TIMESTAMP_DATE],
 
3502
    (char**) &opt_date_time_formats[DRIZZLE_TIMESTAMP_DATE],
 
3503
    (char**) &opt_date_time_formats[DRIZZLE_TIMESTAMP_DATE],
3504
3504
    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
3505
3505
  { "datetime_format", OPT_DATETIME_FORMAT,
3506
3506
    "The DATETIME/TIMESTAMP format (for future).",
3507
 
    (char**) &opt_date_time_formats[MYSQL_TIMESTAMP_DATETIME],
3508
 
    (char**) &opt_date_time_formats[MYSQL_TIMESTAMP_DATETIME],
 
3507
    (char**) &opt_date_time_formats[DRIZZLE_TIMESTAMP_DATETIME],
 
3508
    (char**) &opt_date_time_formats[DRIZZLE_TIMESTAMP_DATETIME],
3509
3509
    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
3510
3510
  { "default_week_format", OPT_DEFAULT_WEEK_FORMAT,
3511
3511
    "The default week format used by WEEK() functions.",
3856
3856
   1024L*128L, ULONG_MAX, 0, 1024, 0},
3857
3857
  { "time_format", OPT_TIME_FORMAT,
3858
3858
    "The TIME format (for future).",
3859
 
    (char**) &opt_date_time_formats[MYSQL_TIMESTAMP_TIME],
3860
 
    (char**) &opt_date_time_formats[MYSQL_TIMESTAMP_TIME],
 
3859
    (char**) &opt_date_time_formats[DRIZZLE_TIMESTAMP_TIME],
 
3860
    (char**) &opt_date_time_formats[DRIZZLE_TIMESTAMP_TIME],
3861
3861
    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
3862
3862
  {"tmp_table_size", OPT_TMP_TABLE_SIZE,
3863
3863
   "If an internal in-memory temporary table exceeds this size, MySQL will"
4756
4756
  if (opt_short_log_format)
4757
4757
    opt_specialflag|= SPECIAL_SHORT_LOG_FORMAT;
4758
4758
 
4759
 
  if (init_global_datetime_format(MYSQL_TIMESTAMP_DATE,
 
4759
  if (init_global_datetime_format(DRIZZLE_TIMESTAMP_DATE,
4760
4760
                                  &global_system_variables.date_format) ||
4761
 
      init_global_datetime_format(MYSQL_TIMESTAMP_TIME,
 
4761
      init_global_datetime_format(DRIZZLE_TIMESTAMP_TIME,
4762
4762
                                  &global_system_variables.time_format) ||
4763
 
      init_global_datetime_format(MYSQL_TIMESTAMP_DATETIME,
 
4763
      init_global_datetime_format(DRIZZLE_TIMESTAMP_DATETIME,
4764
4764
                                  &global_system_variables.datetime_format))
4765
4765
    exit(1);
4766
4766