bugfix: delay_key_write=ALL cannot be turned off

69e076ec · Sergei Golubchik · 42b82357 · 69e076ec
Commit 69e076ec authored Oct 19, 2011 by Sergei Golubchik
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

sql/sys_vars.cc sql/sys_vars.cc +2 -0

No files found.
--- 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;