diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-11-01 09:17:06 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-11-01 09:17:06 +0100 |
| commit | cb86ce60b9bade5ae7712d8f3f74668208ee3fd2 (patch) | |
| tree | daff81c02baa6c2581d6abe3d746b8f35ee44f32 /sql/transaction.cc | |
| parent | f4d5d849fd3b526d38ca6eb083fd0b290eb0eda7 (diff) | |
| parent | 39df665a3332bd9bfb2529419f534a49cfac388c (diff) | |
| download | mariadb-git-cb86ce60b9bade5ae7712d8f3f74668208ee3fd2.tar.gz | |
Merge MDEV-4506: Parallel replication into 10.0-base.
Diffstat (limited to 'sql/transaction.cc')
| -rw-r--r-- | sql/transaction.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/transaction.cc b/sql/transaction.cc index 3b0af4db710..f14b35352c3 100644 --- a/sql/transaction.cc +++ b/sql/transaction.cc @@ -139,6 +139,11 @@ bool trans_begin(THD *thd, uint flags) } thd->variables.option_bits&= ~(OPTION_BEGIN | OPTION_KEEP_LOG); + + /* + The following set should not be needed as the flag should always be 0 + when we come here. We should at some point change this to an assert. + */ thd->transaction.all.modified_non_trans_table= FALSE; if (res) |