database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

MDEV-22707 : galera got stuck after flush tables

Browse Source 
Remove unnecessary condition and add necessary include
for non debug Galera library.
This commit is contained in:
Jan Lindström
2020-10-28 14:00:37 +02:00
parent 65e26bc1ba
commit d5c9f84dfc
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/galera/t/MDEV-22707.test
View File

@@ -6,6 +6,7 @@
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/have_debug.inc --source include/have_debug.inc
--source include/have_debug_sync.inc --source include/have_debug_sync.inc
--source include/galera_have_debug_sync.inc
CREATE TABLE t1(f2 INT) ENGINE=InnoDB; CREATE TABLE t1(f2 INT) ENGINE=InnoDB;

2
sql/sql_base.cc
View File

@@ -1861,7 +1861,7 @@ retry_share:
#ifdef WITH_WSREP #ifdef WITH_WSREP
if (!((flags & MYSQL_OPEN_IGNORE_FLUSH) || if (!((flags & MYSQL_OPEN_IGNORE_FLUSH) ||
(wsrep_on(thd) && thd->wsrep_applier))) (thd->wsrep_applier)))
#else #else
if (!(flags & MYSQL_OPEN_IGNORE_FLUSH)) if (!(flags & MYSQL_OPEN_IGNORE_FLUSH))
#endif #endif