database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

diffed in the fix from revision #3937 from lp:codership-mysql/5.6

Browse Source
This commit is contained in:
Seppo Jaakola
2013-11-27 00:54:21 +02:00
parent 9b16346e84
commit ae8f0eb1ee
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
storage/innobase/srv/srv0conc.cc
View File

@@ -516,12 +516,11 @@ retry:
#ifdef WITH_WSREP
if (wsrep_on(trx->mysql_thd) &&
wsrep_trx_is_aborting(trx->mysql_thd)) {
srv_conc_n_waiting_threads--;
os_fast_mutex_unlock(&srv_conc_mutex);
if (wsrep_debug)
fprintf(stderr, "srv_conc_enter due to MUST_ABORT");
trx->declared_to_be_inside_innodb = TRUE;
trx->n_tickets_to_enter_innodb = SRV_FREE_TICKETS_TO_ENTER;
trx->n_tickets_to_enter_innodb = srv_n_free_tickets_to_enter;
return;
}
trx->wsrep_event = slot->event;