← 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-10-17 16:52:03 UTC
  • mfrom: (520.1.2 drizzle)
  • Revision ID: monty@inaugust.com-20081017165203-z8yif0ht73s0b275
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
242
242
static char *default_storage_engine_str;
243
243
static char compiled_default_collation_name[]= DRIZZLE_DEFAULT_COLLATION_NAME;
244
244
static I_List<THD> thread_cache;
245
 
static double long_query_time;
246
245
 
247
246
static pthread_cond_t COND_thread_cache, COND_flush_thread_cache;
248
247
 
3154
3153
   N_("Push supported query conditions to the storage engine."),
3155
3154
   (char**) &global_system_variables.engine_condition_pushdown,
3156
3155
   (char**) &global_system_variables.engine_condition_pushdown,
3157
 
   0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
 
3156
   0, GET_BOOL, NO_ARG, false, 0, 0, 0, 0, 0},
3158
3157
  /* See how it's handled in get_one_option() */
3159
3158
  {"exit-info", 'T',
3160
3159
   N_("Used for debugging;  Use at your own risk!"),
3581
3580
   (char**) 0,
3582
3581
   0, (GET_ULONG | GET_ASK_ADDR) , REQUIRED_ARG, 100,
3583
3582
   1, 100, 0, 1, 0},
3584
 
  {"long_query_time", OPT_LONG_QUERY_TIME,
3585
 
   N_("Log all queries that have taken more than long_query_time seconds to "
3586
 
      "execute to file. The argument will be treated as a decimal value with "
3587
 
      "microsecond precission."),
3588
 
   (char**) &long_query_time, (char**) &long_query_time, 0, GET_DOUBLE,
3589
 
   REQUIRED_ARG, 10, 0, LONG_TIMEOUT, 0, 0, 0},
3590
3583
  {"max_allowed_packet", OPT_MAX_ALLOWED_PACKET,
3591
3584
   N_("Max packetlength to send/receive from to server."),
3592
3585
   (char**) &global_system_variables.max_allowed_packet,
4730
4723
  /* Set global variables based on startup options */
4731
4724
  myisam_block_size=(uint) 1 << my_bit_log2(opt_myisam_block_size);
4732
4725
 
4733
 
  /* long_query_time is in microseconds */
4734
 
  global_system_variables.long_query_time= max_system_variables.long_query_time=
4735
 
    (int64_t) (long_query_time * 1000000.0);
4736
 
 
4737
4726
  if (init_global_datetime_format(DRIZZLE_TIMESTAMP_DATE,
4738
4727
                                  &global_system_variables.date_format) ||
4739
4728
      init_global_datetime_format(DRIZZLE_TIMESTAMP_TIME,