~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Brian Aker
  • Date: 2009-08-18 07:20:29 UTC
  • mfrom: (1117.1.9 merge)
  • Revision ID: brian@gaz-20090818072029-s9ch5lcmltxwidn7
Merge of Brian

Show diffs side-by-side

added added

removed removed

Lines of Context:
1614
1614
  OPT_PID_FILE,
1615
1615
  OPT_STORAGE_ENGINE,          
1616
1616
  OPT_INIT_FILE,
1617
 
  OPT_DELAY_KEY_WRITE,
1618
1617
  OPT_WANT_CORE,
1619
1618
  OPT_MEMLOCK,
1620
1619
  OPT_SERVER_ID,
1726
1725
   N_("Set the default time zone."),
1727
1726
   (char**) &default_tz_name, (char**) &default_tz_name,
1728
1727
   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
1729
 
  {"delay-key-write", OPT_DELAY_KEY_WRITE,
1730
 
   N_("Type of DELAY_KEY_WRITE."),
1731
 
   0,0,0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
1732
1728
#ifdef HAVE_STACK_TRACE_ON_SEGV
1733
1729
  {"enable-pstack", OPT_DO_PSTACK,
1734
1730
   N_("Print a symbolic stack trace on failure."),