Skip to content

Commit 6c7910e

Browse files
author
Jan Lindström
committed
Fix test galera#505 galera library version check.
Test requires galera library version 25.3.24.
1 parent e63b84b commit 6c7910e

File tree

1 file changed

+8
-14
lines changed

1 file changed

+8
-14
lines changed

mysql-test/suite/galera/t/galera#505.test

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,16 @@
22

33
--source include/galera_cluster.inc
44

5-
--disable_query_log
6-
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;
7-
8-
# Make sure that the test is operating on the right version of galera library.
9-
--let $galera_version=24
10-
eval SET @REQUIRED_GALERA_VERSION='$galera_version';
11-
12-
SELECT @GALERA_VERSION, @REQUIRED_GALERA_VERSION;
5+
--connection node_1
136

14-
if (!`SELECT (@GALERA_VERSION < @REQUIRED_GALERA_VERSION)`)
15-
{
16-
skip Test requires Galera library version 25.3.$galera_version;
17-
}
7+
SET SESSION wsrep_sync_wait=0;
8+
--disable_result_log
9+
--disable_query_log
10+
--let $galera_version=25.3.24
11+
source ../../wsrep/include/check_galera_version.inc;
12+
--enable_result_log
1813
--enable_query_log
19-
20-
--connection node_1
14+
SET SESSION wsrep_sync_wait=DEFAULT;
2115

2216
# Convert "... pc.weight = N; ..." to "N; ..."
2317
--let $s1 = `SELECT SUBSTR(@@wsrep_provider_options, LOCATE('pc.weight =', @@wsrep_provider_options) + LENGTH('pc.weight = '))`

0 commit comments

Comments
 (0)