MDEV-22707 : galera got stuck after flush tables

Remove unnecessary condition and add necessary include for non debug Galera library.
MariaDB · Oct 28, 2020 · d5c9f84 · d5c9f84
1 parent 65e26bc
commit d5c9f84
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -1861,7 +1861,7 @@ bool open_table(THD *thd, TABLE_LIST *table_list, Open_table_context *ot_ctx)
 
 #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