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/wsrep_thd.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/wsrep_thd.cc')
| -rw-r--r-- | sql/wsrep_thd.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/wsrep_thd.cc b/sql/wsrep_thd.cc index 81999d11296..1e27310a201 100644 --- a/sql/wsrep_thd.cc +++ b/sql/wsrep_thd.cc @@ -575,7 +575,7 @@ 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 || wsrep_OSU_method_options == WSREP_OSU_RSU) && + ( (WSREP_ON || bf_thd->wsrep_OSU_method == WSREP_OSU_RSU) && bf_thd->wsrep_exec_mode == TOTAL_ORDER) ) && victim_thd) { |