Merge 10.1 into 10.2

MariaDB · Dec 7, 2017 · 51c73a4 · 51c73a4
2 parents 77fb7cc + 447931c
commit 51c73a4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git 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
@@ -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);
 }