diff options
| author | Teemu Ollakka <teemu.ollakka@galeracluster.com> | 2015-03-12 10:25:34 +0200 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-05-08 17:41:07 -0400 |
| commit | 00afd63984c91cabcfed748d834351ca54b7e50d (patch) | |
| tree | 118093c3849cb443157b2a1537b7e133956b8a7a /sql/wsrep_thd.cc | |
| parent | 03a8f83e2c6c80658c7863b452847dd04dfc5dda (diff) | |
| download | mariadb-git-00afd63984c91cabcfed748d834351ca54b7e50d.tar.gz | |
refs codership/mysql-wsrep#90 made wsrep_OSU_method session variable
Diffstat (limited to 'sql/wsrep_thd.cc')
| -rw-r--r-- | sql/wsrep_thd.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/wsrep_thd.cc b/sql/wsrep_thd.cc index 1e27310a201..a65e0fe731d 100644 --- a/sql/wsrep_thd.cc +++ b/sql/wsrep_thd.cc @@ -575,8 +575,8 @@ int wsrep_abort_thd(void *bf_thd_ptr, void *victim_thd_ptr, my_bool signal) DBUG_ENTER("wsrep_abort_thd"); if ( (WSREP(bf_thd) || - ( (WSREP_ON || bf_thd->wsrep_OSU_method == WSREP_OSU_RSU) && - bf_thd->wsrep_exec_mode == TOTAL_ORDER) ) && + ( (WSREP_ON || bf_thd->variables.wsrep_OSU_method == WSREP_OSU_RSU) && + bf_thd->wsrep_exec_mode == TOTAL_ORDER) ) && victim_thd) { WSREP_DEBUG("wsrep_abort_thd, by: %llu, victim: %llu", (bf_thd) ? |