diff options
| author | Teemu Ollakka <teemu.ollakka@galeracluster.com> | 2015-03-11 13:04:00 +0200 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-05-08 17:41:07 -0400 |
| commit | 2df5ff2691a80873f44e779658c9a5d41c6c7e13 (patch) | |
| tree | 3efde73f9e7ede6536449dd7b792e83bdebcc792 /sql/handler.cc | |
| parent | c16ec074196aee32326a8015f49c0b8bae25111f (diff) | |
| download | mariadb-git-2df5ff2691a80873f44e779658c9a5d41c6c7e13.tar.gz | |
refs codership/mysql-wsrep#90 - fixed race in OSU
Make sure that thd uses the same method to begin and end
OSU operation.
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 6a69af0b900..8bafb178e8b 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -6233,8 +6233,8 @@ int ha_wsrep_abort_transaction(THD *bf_thd, THD *victim_thd, my_bool signal) { DBUG_ENTER("ha_wsrep_abort_transaction"); if (!WSREP(bf_thd) && - !(wsrep_OSU_method_options == WSREP_OSU_RSU && - bf_thd->wsrep_exec_mode == TOTAL_ORDER)) { + !(bf_thd->wsrep_OSU_method == WSREP_OSU_RSU && + bf_thd->wsrep_exec_mode == TOTAL_ORDER)) { DBUG_RETURN(0); } |