From d5c9f84dfc72787c94ca773f83cceee9d93b2014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Wed, 28 Oct 2020 14:00:37 +0200 Subject: [PATCH] MDEV-22707 : galera got stuck after flush tables Remove unnecessary condition and add necessary include for non debug Galera library. --- mysql-test/suite/galera/t/MDEV-22707.test | 1 + sql/sql_base.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/galera/t/MDEV-22707.test b/mysql-test/suite/galera/t/MDEV-22707.test index 19755f7c5ac..feb44e5e44f 100644 --- a/mysql-test/suite/galera/t/MDEV-22707.test +++ b/mysql-test/suite/galera/t/MDEV-22707.test @@ -6,6 +6,7 @@ --source include/have_innodb.inc --source include/have_debug.inc --source include/have_debug_sync.inc +--source include/galera_have_debug_sync.inc CREATE TABLE t1(f2 INT) ENGINE=InnoDB; diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 497c6a0322f..635e17d1865 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1861,7 +1861,7 @@ retry_share: #ifdef WITH_WSREP if (!((flags & MYSQL_OPEN_IGNORE_FLUSH) || - (wsrep_on(thd) && thd->wsrep_applier))) + (thd->wsrep_applier))) #else if (!(flags & MYSQL_OPEN_IGNORE_FLUSH)) #endif