summaryrefslogtreecommitdiff
path: root/storage/maria/ha_maria.cc
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-11-24 19:23:20 +0200
committerMichael Widenius <monty@askmonty.org>2011-11-24 19:23:20 +0200
commit1670845c3b3364720881ad778e456c6b7d852397 (patch)
tree2472a6e49f3d0dc3f103e10dd42a2f51ff076857 /storage/maria/ha_maria.cc
parentd26aefb0775048128495eaab151ee4118f8f7afd (diff)
downloadmariadb-git-1670845c3b3364720881ad778e456c6b7d852397.tar.gz
Fixed that one can use --maria-recover=backup,force
(Before we only allowed one option)
Diffstat (limited to 'storage/maria/ha_maria.cc')
-rw-r--r--storage/maria/ha_maria.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc
index 5661e1f06d7..4d1348bd07f 100644
--- a/storage/maria/ha_maria.cc
+++ b/storage/maria/ha_maria.cc
@@ -60,7 +60,7 @@ ulonglong pagecache_buffer_size;
good. It would happen only after Recovery, if the table is still
corrupted.
*/
-ulong maria_recover_options= HA_RECOVER_NONE;
+ulonglong maria_recover_options= HA_RECOVER_NONE;
handlerton *maria_hton;
/* bits in maria_recover_options */
@@ -198,7 +198,7 @@ static MYSQL_SYSVAR_ULONG(pagecache_division_limit, pagecache_division_limit,
"The minimum percentage of warm blocks in key cache", 0, 0,
100, 1, 100, 1);
-static MYSQL_SYSVAR_ENUM(recover, maria_recover_options, PLUGIN_VAR_OPCMDARG,
+static MYSQL_SYSVAR_SET(recover, maria_recover_options, PLUGIN_VAR_OPCMDARG,
"Specifies how corrupted tables should be automatically repaired."
" Possible values are \"NORMAL\" (the default), \"BACKUP\", \"FORCE\","
" \"QUICK\", or \"OFF\" which is like not using the option.",