Add galera library dependency directly to test case.

MariaDB · Aug 3, 2018 · ea0356e · ea0356e
1 parent 9808e23
commit ea0356e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def
@@ -51,4 +51,4 @@ galera_admin : MDEV-13549 Galera test failures
 MW-416 : MDEV-13549 Galera test failures
 galera_wan : MDEV-13549 Galera test failures
 MW-388 : MDEV-13549 Galera test failures
-galera#505 : Requires galera library version 25.3.24
+
diff --git a/mysql-test/suite/galera/t/galera#505.test b/mysql-test/suite/galera/t/galera#505.test
@@ -2,6 +2,21 @@
 
 --source include/galera_cluster.inc
 
+--disable_query_log
+select CAST(REGEXP_REPLACE(variable_value,'^(\\d+)\\.(\\d+)\\.(\\d+)(r\\d+)','\\3') AS UNSIGNED) FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME LIKE 'wsrep_provider_version' INTO @GALERA_VERSION;
+
+# Make sure that the test is operating on the right version of galera library.
+--let $galera_version=24
+eval SET @REQUIRED_GALERA_VERSION='$galera_version';
+
+SELECT @GALERA_VERSION, @REQUIRED_GALERA_VERSION;
+
+if (!`SELECT (@GALERA_VERSION < @REQUIRED_GALERA_VERSION)`)
+{
+    skip Test requires Galera library version 25.3.$galera_version;
+}
+--enable_query_log
+
 --connection node_1
 
 # Convert "... pc.weight = N; ..." to "N; ..."