diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-08-10 19:19:05 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-08-10 19:19:05 +0200 |
| commit | 309c08c17c56d35e5635a5874fb70719935e5f54 (patch) | |
| tree | db63b0f496364456789f390eb5f693dabf0f94a1 /storage/myisam | |
| parent | c6fdb92ca829fed893d9e7324e80b1450de16087 (diff) | |
| parent | 5ad02062d928cccbd29c0a2db6f0f7ceb33195d1 (diff) | |
| download | mariadb-git-309c08c17c56d35e5635a5874fb70719935e5f54.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/ha_myisam.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index d97aa503d42..dac01b8af89 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -1454,6 +1454,7 @@ int ha_myisam::enable_indexes(uint mode) else if (mode == HA_KEY_SWITCH_NONUNIQ_SAVE) { THD *thd= table->in_use; + int was_error= thd->is_error(); HA_CHECK ¶m= *(HA_CHECK*) thd->alloc(sizeof(param)); const char *save_proc_info=thd->proc_info; @@ -1499,7 +1500,7 @@ int ha_myisam::enable_indexes(uint mode) might have been set by the first repair. They can still be seen with SHOW WARNINGS then. */ - if (! error) + if (! error && ! was_error) thd->clear_error(); } info(HA_STATUS_CONST); |