From bbef7455749e8e02ecbd006326b7fea99a99a5ad Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 13 Apr 2017 00:19:08 +1000 Subject: [PATCH] tests: sys_vars.sysvars_wsrep Rather than bumping the version again, * d036cc9b2f595cac1453f2a251515c6b9a408521, and again * 5a4ec8e60b10c176af1dd84157e1d15cf905637b, and again * 7f19330c595e3183d079fe2c18eecc74740e8f83; Just accept version numbers change. Also accept that people may want to test this against more than one version. --- mysql-test/suite/sys_vars/r/sysvars_wsrep.result | 2 +- mysql-test/suite/sys_vars/t/sysvars_wsrep.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result index 802ee3b1c6d..68ab8bd27a0 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result +++ b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result @@ -367,7 +367,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME WSREP_PATCH_VERSION SESSION_VALUE NULL -GLOBAL_VALUE wsrep_25.19 +GLOBAL_VALUE wsrep_MAJVER.MINVER GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE NULL VARIABLE_SCOPE GLOBAL diff --git a/mysql-test/suite/sys_vars/t/sysvars_wsrep.test b/mysql-test/suite/sys_vars/t/sysvars_wsrep.test index 700b129fd62..c127115efe1 100644 --- a/mysql-test/suite/sys_vars/t/sysvars_wsrep.test +++ b/mysql-test/suite/sys_vars/t/sysvars_wsrep.test @@ -5,7 +5,7 @@ --replace_result $datadir DATADIR --let $hostname_regex=/^$hostname\$/HOSTNAME/ ---replace_regex $hostname_regex +--replace_regex $hostname_regex /wsrep_[0-9]{2}\.[0-9]{1,2}/wsrep_MAJVER.MINVER/ --vertical_results select * from information_schema.system_variables where variable_name like 'wsrep%'