Commit 22345420 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/home/emurphy/iggy/mysql-5.0


sql/mysqld.cc:
  Auto merged
parents bce6a702 136ebf4f

sql/mysqld.cc

+2 −1
Original line number Diff line number Diff line
@@ -4827,7 +4827,8 @@ Disable with --skip-bdb (will save memory).", 
   0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"exit-info", 'T', "Used for debugging;  Use at your own risk!", 0, 0, 0,

   GET_LONG, OPT_ARG, 0, 0, 0, 0, 0, 0},

  {"external-locking", OPT_USE_LOCKING, "Use system (external) locking.  With this option enabled you can run myisamchk to test (not repair) tables while the MySQL server is running.",

  {"external-locking", OPT_USE_LOCKING, "Use system (external) locking (disabled by default). With this option enabled you can run myisamchk to test (not repair) tables while the MySQL server is running. \

Disable with --skip-external-locking.",

   (gptr*) &opt_external_locking, (gptr*) &opt_external_locking,

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

  {"flush", OPT_FLUSH, "Flush tables to disk between SQL commands.", 0, 0, 0,