Skip to content

Commit ea0356e

Browse files
author
Jan Lindström
committed
Add galera library dependency directly to test case.
1 parent 9808e23 commit ea0356e

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

mysql-test/suite/galera/disabled.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ galera_admin : MDEV-13549 Galera test failures
5151
MW-416 : MDEV-13549 Galera test failures
5252
galera_wan : MDEV-13549 Galera test failures
5353
MW-388 : MDEV-13549 Galera test failures
54-
galera#505 : Requires galera library version 25.3.24
54+

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,21 @@
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;
13+
14+
if (!`SELECT (@GALERA_VERSION < @REQUIRED_GALERA_VERSION)`)
15+
{
16+
skip Test requires Galera library version 25.3.$galera_version;
17+
}
18+
--enable_query_log
19+
520
--connection node_1
621

722
# Convert "... pc.weight = N; ..." to "N; ..."

0 commit comments

Comments
 (0)