database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.0 -> 10.1

Browse Source
This commit is contained in:
Kristian Nielsen
2015-04-20 13:21:58 +02:00
parent c6d08ecce3 519ad0f7e3
commit 791b0ab5db
41 changed files with 1196 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.cc
View File

@@ -905,6 +905,7 @@ THD::THD(bool is_wsrep_applier)
in_lock_tables(0),
bootstrap(0),
derived_tables_processing(FALSE),
waiting_on_group_commit(FALSE), has_waiter(FALSE),
spcont(NULL),
m_parser_state(NULL),
#if defined(ENABLED_DEBUG_SYNC)
@@ -4508,6 +4509,7 @@ thd_report_wait_for(MYSQL_THD thd, MYSQL_THD other_thd)
thd->transaction.stmt.mark_trans_did_wait();
if (!other_thd)
return;
binlog_report_wait_for(thd, other_thd);
rgi= thd->rgi_slave;
other_rgi= other_thd->rgi_slave;
if (!rgi || !other_rgi)