mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refs codership/mysql-wsrep#184

Browse source 
Merge fix to XtraDB engine.
This commit is contained in:
Nirbhay Choubey 2016-02-22 16:51:45 -05:00
parent 251c53a8a7
commit c1ea0570af
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
storage/xtradb/lock/lock0wait.cc
View file

@ -394,8 +394,9 @@ lock_wait_suspend_thread(
if (lock_wait_timeout < 100000000
&& wait_time > (double) lock_wait_timeout) {
#ifdef WITH_WSREP
if (!wsrep_is_BF_lock_timeout(trx)
&& trx->error_state != DB_DEADLOCK) {
if (!wsrep_on(trx->mysql_thd) ||
(!wsrep_is_BF_lock_timeout(trx) &&
trx->error_state != DB_DEADLOCK)) {
#endif /* WITH_WSREP */
trx->error_state = DB_LOCK_WAIT_TIMEOUT;