From 69e076ec787f0d6ca38a46cd86c5a4999fe33ab0 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Wed, 19 Oct 2011 22:51:24 +0200
Subject: [PATCH] bugfix: delay_key_write=ALL cannot be turned off

---
 sql/sys_vars.cc | 2 ++
 1 file changed, 2 insertions(+)

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;