← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Mark Atwood
  • Date: 2011-08-17 19:14:47 UTC
  • mfrom: (2385.3.17 rf)
  • Revision ID: me@mark.atwood.name-20110817191447-h86yzddvycd0xmof
merge lp:~olafvdspek/drizzle/refactor6

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
1233
1233
  ("table-lock-wait-timeout", po::value<uint64_t>(&table_lock_wait_timeout)->default_value(50)->notifier(&check_limits_tlwt),
1234
1234
  _("Timeout in seconds to wait for a table level lock before returning an "
1235
1235
     "error. Used only if the connection has active cursors."))
1236
 
  ("thread-stack", po::value<size_t>(&my_thread_stack_size)->default_value(DEFAULT_THREAD_STACK)->notifier(&check_limits_thread_stack),
 
1236
  ("thread-stack", po::value<size_t>(&my_thread_stack_size)->default_value(0)->notifier(&check_limits_thread_stack),
1237
1237
  _("The stack size for each thread."))
1238
1238
  ("tmp-table-size",
1239
1239
  po::value<uint64_t>(&global_system_variables.tmp_table_size)->default_value(16*1024*1024L)->notifier(&check_limits_tmp_table_size),
1848
1848
   N_("The stack size for each thread."),
1849
1849
   (char**) &my_thread_stack_size,
1850
1850
   NULL, 0, GET_SIZE,
1851
 
   REQUIRED_ARG,DEFAULT_THREAD_STACK,
 
1851
   REQUIRED_ARG,0,
1852
1852
   UINT32_C(1024*512), (int64_t)SIZE_MAX, 0, 1024, 0},
1853
1853
  {"tmp_table_size", OPT_TMP_TABLE_SIZE,
1854
1854
   N_("If an internal in-memory temporary table exceeds this size, Drizzle will"