summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru>2007-08-01 11:41:13 +0500
committerunknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru>2007-08-01 11:41:13 +0500
commit1281fbc58c139b90a329ae3519f46d2b0b75a249 (patch)
tree2e4dcf31eb475cbc4938f7a1f86c1ca4d5f13d99 /sql
parent6fb214b4261b60fbfd4d27f780f639eadfcfcdc0 (diff)
downloadmariadb-git-1281fbc58c139b90a329ae3519f46d2b0b75a249.tar.gz
Fix for bug #30088: Can't disable myisam-recover by a value of "".
- test result. Problem: we don't proper handle "" value of the --myisam-recover option. Fix: turn off myisam recovering if --myisam-recover="" is set. mysql-test/r/show_check.result: Fix for bug #30088: Can't disable myisam-recover by a value of "". - test result. mysql-test/t/show_check-master.opt: Fix for bug #30088: Can't disable myisam-recover by a value of "". - test case. mysql-test/t/show_check.test: Fix for bug #30088: Can't disable myisam-recover by a value of "". - test case. sql/mysqld.cc: Fix for bug #30088: Can't disable myisam-recover by a value of "". - turn off myisam recovering if --myisam-recover="" is passed.
Diffstat (limited to 'sql')
-rw-r--r--sql/mysqld.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 9eb3d157dcf..57d1656736d 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -7241,11 +7241,16 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
#endif /* HAVE_INNOBASE_DB */
case OPT_MYISAM_RECOVER:
{
- if (!argument || !argument[0])
+ if (!argument)
{
myisam_recover_options= HA_RECOVER_DEFAULT;
myisam_recover_options_str= myisam_recover_typelib.type_names[0];
}
+ else if (!argument[0])
+ {
+ myisam_recover_options= HA_RECOVER_NONE;
+ myisam_recover_options_str= "OFF";
+ }
else
{
myisam_recover_options_str=argument;