diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-04-20 13:21:58 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-04-20 13:21:58 +0200 |
| commit | 791b0ab5db47528d93cdaf534114e417ff06b66a (patch) | |
| tree | b47e7bc501a73ce95328dddced35b891d5ac21ba /sql/transaction.cc | |
| parent | c6d08ecce3e7c18ecaae973c67bd2e547e0db4dd (diff) | |
| parent | 519ad0f7e35ff4dd13aac3c13da44c649f724352 (diff) | |
| download | mariadb-git-791b0ab5db47528d93cdaf534114e417ff06b66a.tar.gz | |
Merge 10.0 -> 10.1
Diffstat (limited to 'sql/transaction.cc')
| -rw-r--r-- | sql/transaction.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/transaction.cc b/sql/transaction.cc index d6ef160206b..f84c4e5a892 100644 --- a/sql/transaction.cc +++ b/sql/transaction.cc @@ -156,6 +156,8 @@ bool trans_begin(THD *thd, uint flags) */ thd->transaction.all.modified_non_trans_table= FALSE; thd->transaction.all.m_unsafe_rollback_flags&= ~THD_TRANS::DID_WAIT; + thd->has_waiter= false; + thd->waiting_on_group_commit= false; if (res) DBUG_RETURN(TRUE); |