diff options
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/mi_check.c | 4 | ||||
| -rw-r--r-- | storage/myisam/mysql-test/storage_engine/parts/disabled.def | 0 |
2 files changed, 3 insertions, 1 deletions
diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c index bbe45aa3c26..6902ae00ccf 100644 --- a/storage/myisam/mi_check.c +++ b/storage/myisam/mi_check.c @@ -2680,6 +2680,8 @@ int mi_repair_parallel(HA_CHECK *param, register MI_INFO *info, */ DBUG_PRINT("info", ("is quick repair: %d", rep_quick)); bzero((char*)&sort_info,sizeof(sort_info)); + if (!rep_quick) + my_b_clear(&new_data_cache); /* Initialize pthread structures before goto err. */ mysql_mutex_init(mi_key_mutex_MI_SORT_INFO_mutex, &sort_info.mutex, MY_MUTEX_INIT_FAST); @@ -3055,7 +3057,7 @@ err: already or they were not yet started (if the error happend before creating the threads). */ - if (!rep_quick) + if (!rep_quick && my_b_inited(&new_data_cache)) (void) end_io_cache(&new_data_cache); if (!got_error) { diff --git a/storage/myisam/mysql-test/storage_engine/parts/disabled.def b/storage/myisam/mysql-test/storage_engine/parts/disabled.def new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/storage/myisam/mysql-test/storage_engine/parts/disabled.def |