Commit 440da8a7 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-new 

into  mysql.com:/home/jimw/my/mysql-5.1-clean
parents 2cbf400b 0a3da3b0

sql/mysqld.cc

+3 −3
Original line number Diff line number Diff line
@@ -4697,12 +4697,12 @@ Disable with --skip-bdb (will save memory).", 
  {"bdb-lock-detect", OPT_BDB_LOCK,

   "Berkeley lock detect (DEFAULT, OLDEST, RANDOM or YOUNGEST, # sec).",

   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"bdb-logdir", OPT_BDB_LOG, "Berkeley DB log file directory.",

   (gptr*) &berkeley_logdir, (gptr*) &berkeley_logdir, 0, GET_STR,

   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"bdb-log-direct", OPT_BDB_LOG_DIRECT,

   "Turn off system buffering of BDB log files to avoid double caching.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"bdb-logdir", OPT_BDB_LOG, "Berkeley DB log file directory.",

   (gptr*) &berkeley_logdir, (gptr*) &berkeley_logdir, 0, GET_STR,

   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"bdb-no-recover", OPT_BDB_NO_RECOVER,

   "Don't try to recover Berkeley DB tables on start.", 0, 0, 0, GET_NO_ARG,

   NO_ARG, 0, 0, 0, 0, 0, 0},

sql/set_var.cc

+2 −2
Original line number Diff line number Diff line
@@ -791,9 +791,9 @@ struct show_var_st init_vars[]= { 
  {sys_myisam_repair_threads.name, (char*) &sys_myisam_repair_threads,

   SHOW_SYS},

  {sys_myisam_sort_buffer_size.name, (char*) &sys_myisam_sort_buffer_size, SHOW_SYS},

  {sys_myisam_use_mmap.name, (char*) &sys_myisam_use_mmap, SHOW_SYS},

  

  {sys_myisam_stats_method.name, (char*) &sys_myisam_stats_method, SHOW_SYS},

  {sys_myisam_use_mmap.name, (char*) &sys_myisam_use_mmap, SHOW_SYS},

  

#ifdef __NT__

  {"named_pipe",	      (char*) &opt_enable_named_pipe,       SHOW_MY_BOOL},
@@ -885,8 +885,8 @@ struct show_var_st init_vars[]= { 
  {"system_time_zone",        system_time_zone,                     SHOW_CHAR},

#endif

  {"table_definition_cache",  (char*) &table_def_size,              SHOW_LONG},

  {"table_open_cache",        (char*) &table_cache_size,            SHOW_LONG},

  {"table_lock_wait_timeout", (char*) &table_lock_wait_timeout,     SHOW_LONG },

  {"table_open_cache",        (char*) &table_cache_size,            SHOW_LONG},

  {sys_table_type.name,	      (char*) &sys_table_type,	            SHOW_SYS},

  {sys_thread_cache_size.name,(char*) &sys_thread_cache_size,       SHOW_SYS},

#ifdef HAVE_THR_SETCONCURRENCY