bk commit into 5.1 tree (paul:1.1958)

[paul]

Below is the list of changes that have just been committed into a local
5.1 repository of paul. When paul does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1958 05/12/06 13:21:29 paul@stripped +2 -0
  mysqld.cc:
    Put options in order.
  set_var.cc:
    Put system variables back in order.

  sql/mysqld.cc
    1.500 05/12/06 13:07:27 paul@stripped +3 -3
    Put options in order.

  sql/set_var.cc
    1.151 05/12/06 13:07:15 paul@stripped +2 -2
    Put system variables back in order.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	paul
# Host:	kite-hub.kitebird.com
# Root:	/src/extern/MySQL/bk/mysql-5.1

--- 1.499/sql/mysqld.cc	2005-12-05 20:09:39 -06:00
+++ 1.500/sql/mysqld.cc	2005-12-06 13:07:27 -06:00
@@ -4697,12 +4697,12 @@
   {"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},

--- 1.150/sql/set_var.cc	2005-12-01 06:34:08 -06:00
+++ 1.151/sql/set_var.cc	2005-12-06 13:07:15 -06:00
@@ -791,9 +791,9 @@
   {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 @@
   {"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