revision-id: ea0356e1ad506e55f2c26808c9b0e2d88953c79e (mariadb-galera-10.0.35-22-gea0356e1ad5) parent(s): 9808e23a7aceeea69112fe8b6bf54460ecf4bb65 author: Jan Lindström committer: Jan Lindström timestamp: 2018-08-03 16:43:32 +0300 message: Add galera library dependency directly to test case. --- mysql-test/suite/galera/disabled.def | 2 +- mysql-test/suite/galera/t/galera#505.test | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index bb5bd04c1f1..1dd3128a2d7 100644 --- 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 index 74aa781bc54..78cdf53db74 100644 --- 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; ..."