diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-07 08:17:50 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-07 08:17:50 +0200 |
| commit | 51c73a431ffb5fd746819aae12f74f9ab8ed0f90 (patch) | |
| tree | 14f3defe1b411ca15f5fcccbcfe4299b582d9631 /storage | |
| parent | 77fb7ccba41e9a901053ffc4fdc461968f6f616f (diff) | |
| parent | 447931c6ab69c69c442ba89cf2b9fea664e288f8 (diff) | |
| download | mariadb-git-51c73a431ffb5fd746819aae12f74f9ab8ed0f90.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/dict/dict0defrag_bg.cc | 1 | ||||
| -rw-r--r-- | storage/xtradb/dict/dict0stats_bg.cc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/storage/innobase/dict/dict0defrag_bg.cc b/storage/innobase/dict/dict0defrag_bg.cc index 82f3f4d7ad9..8f2c3231e1c 100644 --- a/storage/innobase/dict/dict0defrag_bg.cc +++ b/storage/innobase/dict/dict0defrag_bg.cc @@ -241,6 +241,7 @@ dict_stats_process_entry_from_defrag_pool(trx_t* trx) return; } + mutex_exit(&dict_sys->mutex); ++trx->will_lock; dberr_t err = dict_stats_save_defrag_stats(index, trx); diff --git a/storage/xtradb/dict/dict0stats_bg.cc b/storage/xtradb/dict/dict0stats_bg.cc index e2e7ad827b6..e166e7df72a 100644 --- a/storage/xtradb/dict/dict0stats_bg.cc +++ b/storage/xtradb/dict/dict0stats_bg.cc @@ -512,6 +512,7 @@ dict_stats_process_entry_from_defrag_pool() return; } + mutex_exit(&dict_sys->mutex); dict_stats_save_defrag_stats(index); dict_table_close(table, FALSE, FALSE); } |