database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2019-05-05 15:03:48 +03:00
parent b132b8895e e8dd18a474
commit d3dcec5d65
125 changed files with 1950 additions and 1736 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/lock.cc
View File

@ -253,16 +253,11 @@ static void track_table_access(THD *thd, TABLE **tables, size_t count)
{
if (thd->variables.session_track_transaction_info > TX_TRACK_NONE)
{
Transaction_state_tracker *tst= (Transaction_state_tracker *)
thd->session_tracker.get_tracker(TRANSACTION_INFO_TRACKER);
while (count--)
{
TABLE *t= tables[count];
if (t)
tst->add_trx_state(thd, t->reginfo.lock_type,
t->file->has_transaction_manager());
if (TABLE *t= tables[count])
thd->session_tracker.transaction_info.add_trx_state(thd,
t->reginfo.lock_type, t->file->has_transaction_manager());
}
}
}