summaryrefslogtreecommitdiff
path: root/sql/sys_vars.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-10-19 22:51:24 +0200
committerSergei Golubchik <sergii@pisem.net>2011-10-19 22:51:24 +0200
commit69e076ec787f0d6ca38a46cd86c5a4999fe33ab0 (patch)
tree0e08a7c7008ef6e58b7448c1e0c4828399d917a2 /sql/sys_vars.cc
parent42b8235788f7556fef1295dc281a29da4afe0f7d (diff)
downloadmariadb-git-69e076ec787f0d6ca38a46cd86c5a4999fe33ab0.tar.gz
bugfix: delay_key_write=ALL cannot be turned off
Diffstat (limited to 'sql/sys_vars.cc')
-rw-r--r--sql/sys_vars.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index b6981ea08bd..bb6a130cf5a 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -581,9 +581,11 @@ export bool fix_delay_key_write(sys_var *self, THD *thd, enum_var_type type)
switch (delay_key_write_options) {
case DELAY_KEY_WRITE_NONE:
myisam_delay_key_write=0;
+ ha_open_options&= ~HA_OPEN_DELAY_KEY_WRITE;
break;
case DELAY_KEY_WRITE_ON:
myisam_delay_key_write=1;
+ ha_open_options&= ~HA_OPEN_DELAY_KEY_WRITE;
break;
case DELAY_KEY_WRITE_ALL:
myisam_delay_key_write=1;