Merge mysql.com:/home/ram/work/b30088/b30088.5.0

into  mysql.com:/home/ram/work/b30088/b30088.5.1

mysql-test/t/show_check-master.opt

---log-slow-queries --log-long-format --log-queries-not-using-indexes
+--log-slow-queries --log-long-format --log-queries-not-using-indexes --myisam-recover=""

mysql-test/t/show_check.test

@@ -903,6 +903,11 @@ show variables like "log_queries_not_using_indexes";
 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
 
 --disable_result_log

sql/mysqld.cc

@@ -7627,11 +7627,16 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
 #endif
   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;