1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 10.1 into 10.2

Browse Source
This commit is contained in:
Marko Mäkelä 2017-12-07 08:17:50 +02:00
commit 51c73a431f
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
storage/innobase/dict/dict0defrag_bg.cc
View File

@ -241,6 +241,7 @@ dict_stats_process_entry_from_defrag_pool(trx_t* trx)
return; return;
} }
mutex_exit(&dict_sys->mutex);
++trx->will_lock; ++trx->will_lock;
dberr_t err = dict_stats_save_defrag_stats(index, trx); dberr_t err = dict_stats_save_defrag_stats(index, trx);

1
storage/xtradb/dict/dict0stats_bg.cc
View File

@ -512,6 +512,7 @@ dict_stats_process_entry_from_defrag_pool()
return; return;
} }
mutex_exit(&dict_sys->mutex);
dict_stats_save_defrag_stats(index); dict_stats_save_defrag_stats(index);
dict_table_close(table, FALSE, FALSE); dict_table_close(table, FALSE, FALSE);
} }