Merge mysql_cab_desk.:C:/source/c++/mysql-5.1

into  mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl-merge

1 files changed, 8 insertions, 2 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 6d22047b9db..536d3d95933 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -6320,7 +6320,8 @@ The minimum value for this variable is 4096.",
     (uchar**) &opt_date_time_formats[MYSQL_TIMESTAMP_TIME],
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"tmp_table_size", OPT_TMP_TABLE_SIZE,
-   "If an in-memory temporary table exceeds this size, MySQL will automatically convert it to an on-disk MyISAM table.",
+   "If an internal in-memory temporary table exceeds this size, MySQL will"
+   " automatically convert it to an on-disk MyISAM table.",
    (uchar**) &global_system_variables.tmp_table_size,
    (uchar**) &max_system_variables.tmp_table_size, 0, GET_ULL,
    REQUIRED_ARG, 16*1024*1024L, 1024, MAX_MEM_TABLE_SIZE, 0, 1, 0},
@@ -7626,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;