database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

refs codership/mysql-wsrep#90 - fixed race in OSU

Browse Source 
Make sure that thd uses the same method to begin and end
OSU operation.
This commit is contained in:
Teemu Ollakka
2015-03-11 13:04:00 +02:00
committed by Nirbhay Choubey
parent c16ec07419
commit 2df5ff2691
6 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/handler.cc
View File

@@ -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);
}