revision-id: 0e5e0ea67724d144f38d4c1b10bb95e86c48a579 (mariadb-10.2.16-128-g0e5e0ea6772) parent(s): e1951723fa45b35c1849416d01162776b6b02838 author: Jan Lindström committer: Jan Lindström timestamp: 2018-09-12 11:25:47 +0300 message: Fix test galera#505 galera library version check. Test requires galera library version 25.3.24. --- mysql-test/suite/galera/t/galera#505.test | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/mysql-test/suite/galera/t/galera#505.test b/mysql-test/suite/galera/t/galera#505.test index 78cdf53db74..785b1411596 100644 --- a/mysql-test/suite/galera/t/galera#505.test +++ b/mysql-test/suite/galera/t/galera#505.test @@ -2,22 +2,16 @@ --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; +--connection node_1 -if (!`SELECT (@GALERA_VERSION < @REQUIRED_GALERA_VERSION)`) -{ - skip Test requires Galera library version 25.3.$galera_version; -} +SET SESSION wsrep_sync_wait=0; +--disable_result_log +--disable_query_log +--let $galera_version=25.3.24 +source ../../wsrep/include/check_galera_version.inc; +--enable_result_log --enable_query_log - ---connection node_1 +SET SESSION wsrep_sync_wait=DEFAULT; # Convert "... pc.weight = N; ..." to "N; ..." --let $s1 = `SELECT SUBSTR(@@wsrep_provider_options, LOCATE('pc.weight =', @@wsrep_provider_options) + LENGTH('pc.weight = '))`