diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-07-14 16:05:29 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-07-14 16:05:29 -0400 |
| commit | dced5146bdfc46e200ba35a86c3c55fb60972e33 (patch) | |
| tree | 22e3dd18f4edec2a585341fee607765f96b2744f /sql/handler.cc | |
| parent | 75931feabe99595e9659a423e299c4229d3c02ba (diff) | |
| download | mariadb-git-dced5146bdfc46e200ba35a86c3c55fb60972e33.tar.gz | |
Merge branch '10.0-galera' into 10.1
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index f85575fa208..ee433949d33 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -53,6 +53,7 @@ #include "wsrep_mysqld.h" #include "wsrep.h" +#include "wsrep_xid.h" /* While we have legacy_db_type, we have this array to @@ -1437,7 +1438,7 @@ int ha_commit_trans(THD *thd, bool all) if (!error && WSREP_ON && wsrep_is_wsrep_xid(&thd->transaction.xid_state.xid)) { // xid was rewritten by wsrep - xid= wsrep_xid_seqno(&thd->transaction.xid_state.xid); + xid= wsrep_xid_seqno(thd->transaction.xid_state.xid); } if (!is_real_trans) @@ -1830,8 +1831,8 @@ static my_bool xarecover_handlerton(THD *unused, plugin_ref plugin, for (int i=0; i < got; i ++) { my_xid x= WSREP_ON && wsrep_is_wsrep_xid(&info->list[i]) ? - wsrep_xid_seqno(&info->list[i]) : - info->list[i].get_my_xid(); + wsrep_xid_seqno(info->list[i]) : + info->list[i].get_my_xid(); if (!x) // not "mine" - that is generated by external TM { #ifndef DBUG_OFF @@ -6013,7 +6014,7 @@ int ha_abort_transaction(THD *bf_thd, THD *victim_thd, my_bool signal) { DBUG_ENTER("ha_abort_transaction"); if (!WSREP(bf_thd) && - !(wsrep_OSU_method_options == WSREP_OSU_RSU && + !(bf_thd->variables.wsrep_OSU_method == WSREP_OSU_RSU && bf_thd->wsrep_exec_mode == TOTAL_ORDER)) { DBUG_RETURN(0); } |