diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-09-12 11:25:47 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-09-12 19:54:40 +0300 |
| commit | 6c7910ee221c7ceb3826088b3f00ea95ba3b93ba (patch) | |
| tree | 500918ca50c576dd81e05f640c8131a0b79ec084 /mysql-test | |
| parent | e63b84b9167f334605dfe1f1b46555cdd2e13a8d (diff) | |
| download | mariadb-git-6c7910ee221c7ceb3826088b3f00ea95ba3b93ba.tar.gz | |
Fix test galera#505 galera library version check.
Test requires galera library version 25.3.24.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/galera/t/galera#505.test | 22 |
1 files 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 = '))` |