diff options
| author | ramil/ram@ramil.myoffice.izhnet.ru <> | 2007-08-02 16:56:32 +0500 |
|---|---|---|
| committer | ramil/ram@ramil.myoffice.izhnet.ru <> | 2007-08-02 16:56:32 +0500 |
| commit | 7512856c315ba2a4b698f9c4be7f902953cde1bd (patch) | |
| tree | 156d08e52b1193e26302fc8783763c2685ab2975 /sql | |
| parent | 54ddf932405da77a4c0b5369bbc3c47e0ebd4895 (diff) | |
| parent | c62d7528c867626e735d74efffa7e69baf92c35f (diff) | |
| download | mariadb-git-7512856c315ba2a4b698f9c4be7f902953cde1bd.tar.gz | |
Merge mysql.com:/home/ram/work/b30088/b30088.5.0
into mysql.com:/home/ram/work/b30088/b30088.5.1
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 5e2139acd91..536d3d95933 100644 --- a/sql/mysqld.cc +++ b/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; |