summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2020-10-24 14:57:16 +0300
committerJan Lindström <jan.lindstrom@mariadb.com>2020-10-24 14:57:57 +0300
commit44c958dd7b454ebbdbf7ac8b066592c82dd3409f (patch)
tree52e0b7b00fb68187b17064bff5472a13271eeb3c
parentf679d72679376d04c863e80bc68d084eb56795a5 (diff)
downloadmariadb-git-44c958dd7b454ebbdbf7ac8b066592c82dd3409f.tar.gz
Fix test failure on wsrep/variables test case.
-rw-r--r--mysql-test/include/galera_have_debug_sync.inc9
-rw-r--r--mysql-test/suite/wsrep/t/variables.test1
2 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/include/galera_have_debug_sync.inc b/mysql-test/include/galera_have_debug_sync.inc
new file mode 100644
index 00000000000..21e7b3c88c3
--- /dev/null
+++ b/mysql-test/include/galera_have_debug_sync.inc
@@ -0,0 +1,9 @@
+--disable_query_log
+
+--let $galera_have_debug_sync = `SELECT 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_debug_sync_waiters'`
+
+--if (!$galera_have_debug_sync) {
+ --skip Test requires Galera debug library with debug_sync functionality
+}
+
+--enable_query_log
diff --git a/mysql-test/suite/wsrep/t/variables.test b/mysql-test/suite/wsrep/t/variables.test
index 1a2ab2579a5..15b69f8b7f6 100644
--- a/mysql-test/suite/wsrep/t/variables.test
+++ b/mysql-test/suite/wsrep/t/variables.test
@@ -1,4 +1,5 @@
--source include/have_wsrep.inc
+--source include/galera_have_debug_sync.inc
SET @wsrep_provider_options_saved= @@global.wsrep_provider_options;
SET @wsrep_cluster_address_saved= @@global.wsrep_cluster_address;