diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-07-25 00:41:54 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-07-25 00:41:54 +0300 |
| commit | 786ad0a158f92eae0d65b02f34e864a7bbd8390e (patch) | |
| tree | 8b796ce3ce81ab3c1f73e6eb5c594c74619810c0 /storage/myisam | |
| parent | 2ce3f95151a424f950be40140c45b0ba583e07ab (diff) | |
| parent | c8a0244e957bc4beff453f09c881bb51752d682c (diff) | |
| download | mariadb-git-786ad0a158f92eae0d65b02f34e864a7bbd8390e.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 10.0
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 |