bk commit into 5.0 tree (ramil:1.2482) BUG#30088

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram 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@stripped, 2007-08-01 11:41:13+05:00, ramil@stripped +4 -0
  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@stripped, 2007-08-01 11:41:04+05:00, ramil@stripped +3 -0
    Fix for bug #30088: Can't disable myisam-recover by a value of "".
      - test result.

  mysql-test/t/show_check-master.opt@stripped, 2007-08-01 11:41:04+05:00, ramil@stripped +1 -1
    Fix for bug #30088: Can't disable myisam-recover by a value of "".
      - test case.

  mysql-test/t/show_check.test@stripped, 2007-08-01 11:41:04+05:00, ramil@stripped +5 -0
    Fix for bug #30088: Can't disable myisam-recover by a value of "".
      - test case.

  sql/mysqld.cc@stripped, 2007-08-01 11:41:04+05:00, ramil@stripped +6 -1
    Fix for bug #30088: Can't disable myisam-recover by a value of "".
      - turn off myisam recovering if --myisam-recover="" is passed.

diff -Nrup a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
--- a/mysql-test/r/show_check.result	2007-07-05 15:34:10 +05:00
+++ b/mysql-test/r/show_check.result	2007-08-01 11:41:04 +05:00
@@ -1118,4 +1118,7 @@ select 1 from information_schema.tables 
 show status like 'slow_queries';
 Variable_name	Value
 Slow_queries	2
+show variables like 'myisam_recover_options';
+Variable_name	Value
+myisam_recover_options	OFF
 End of 5.0 tests
diff -Nrup a/mysql-test/t/show_check-master.opt b/mysql-test/t/show_check-master.opt
--- a/mysql-test/t/show_check-master.opt	2006-10-13 00:48:09 +05:00
+++ b/mysql-test/t/show_check-master.opt	2007-08-01 11:41:04 +05:00
@@ -1 +1 @@
---log-slow-queries --log-long-format --log-queries-not-using-indexes
+--log-slow-queries --log-long-format --log-queries-not-using-indexes --myisam-recover=""
diff -Nrup a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
--- a/mysql-test/t/show_check.test	2007-07-05 15:34:10 +05:00
+++ b/mysql-test/t/show_check.test	2007-08-01 11:41:04 +05:00
@@ -782,4 +782,9 @@ show variables like "log_queries_not_usi
 select 1 from information_schema.tables limit 1;
 show status like 'slow_queries';
 
+#
+# Bug #30088: Can't disable myisam-recover by a value of ""
+#
+show variables like 'myisam_recover_options';
+
 --echo End of 5.0 tests
diff -Nrup a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc	2007-07-26 01:29:50 +05:00
+++ b/sql/mysqld.cc	2007-08-01 11:41:04 +05:00
@@ -7241,10 +7241,15 @@ get_one_option(int optid, const struct m
 #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
     {