diff options
| author | unknown <elliot@mysql.com> | 2006-05-26 15:00:09 -0400 |
|---|---|---|
| committer | unknown <elliot@mysql.com> | 2006-05-26 15:00:09 -0400 |
| commit | 22345420421f3a4db7fd94113afa952e6a941a91 (patch) | |
| tree | 44acbd851fda4a33e63f2884963bfeb6aded9a74 /sql | |
| parent | bce6a702f3f7818d67a89c8cee8a05bd8ba69f33 (diff) | |
| parent | 136ebf4f81ddc22fc1c361e57ad8c857dc51603a (diff) | |
| download | mariadb-git-22345420421f3a4db7fd94113afa952e6a941a91.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/emurphy/iggy/mysql-5.0
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 7a061d6edd2..158f707d782 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -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, |