diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-11-27 00:18:44 +0200 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-11-27 00:18:44 +0200 |
| commit | b098b7a84c374ee7e5a133cbf16be643609c1543 (patch) | |
| tree | 7ccafb77802062c13a0fa5f2a316cd3cfbaca872 /sql/wsrep_hton.cc | |
| parent | 6422d276fa8d1217aa68be1d90c712efa4d71409 (diff) | |
| download | mariadb-git-b098b7a84c374ee7e5a133cbf16be643609c1543.tar.gz | |
bzr merge -r3904..3928 lp:codership-mysql/5.5
This is now otherwise on level wsrep-25.9, but storage/innobase has not been fully merged
wsrep-5.5 is not good source for that, so we probably have to cherry pick innodb changes from wsrep-5.6
Diffstat (limited to 'sql/wsrep_hton.cc')
| -rw-r--r-- | sql/wsrep_hton.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/wsrep_hton.cc b/sql/wsrep_hton.cc index 24f193e8c7b..1a3b3d64cbe 100644 --- a/sql/wsrep_hton.cc +++ b/sql/wsrep_hton.cc @@ -68,7 +68,7 @@ handlerton *wsrep_hton; */ void wsrep_register_hton(THD* thd, bool all) { - if (thd->wsrep_exec_mode != TOTAL_ORDER) + if (thd->wsrep_exec_mode != TOTAL_ORDER && !thd->wsrep_apply_toi) { THD_TRANS *trans=all ? &thd->transaction.all : &thd->transaction.stmt; for (Ha_trx_info *i= trans->ha_list; WSREP(thd) && i; i = i->next()) |