Skip to content

Commit 4d300ab

Browse files
author
Jan Lindström
committed
MDEV-24867 : wsrep.variables MTR failed: Result length mismatch
Stabilize test case.
1 parent 067465c commit 4d300ab

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

mysql-test/suite/wsrep/r/variables.result

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -136,16 +136,6 @@ drop user test@localhost;
136136
#
137137
SET @wsrep_sst_auth_saved= @@global.wsrep_sst_auth;
138138
SET @@global.wsrep_sst_auth= 'user:pass';
139-
SELECT @@global.wsrep_sst_auth;
140-
@@global.wsrep_sst_auth
141-
********
142139
SET @@global.wsrep_sst_auth= '';
143-
SELECT @@global.wsrep_sst_auth;
144-
@@global.wsrep_sst_auth
145-
NULL
146140
SET @@global.wsrep_sst_auth= NULL;
147-
SELECT @@global.wsrep_sst_auth;
148-
@@global.wsrep_sst_auth
149-
NULL
150-
SET @@global.wsrep_sst_auth= @wsrep_sst_auth_saved;
151141
# End of test.

mysql-test/suite/wsrep/t/variables.test

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,15 +152,13 @@ drop user test@localhost;
152152
--echo #
153153
SET @wsrep_sst_auth_saved= @@global.wsrep_sst_auth;
154154
SET @@global.wsrep_sst_auth= 'user:pass';
155-
SELECT @@global.wsrep_sst_auth;
156155
SET @@global.wsrep_sst_auth= '';
157-
SELECT @@global.wsrep_sst_auth;
158156
SET @@global.wsrep_sst_auth= NULL;
159-
SELECT @@global.wsrep_sst_auth;
160-
SET @@global.wsrep_sst_auth= @wsrep_sst_auth_saved;
161157

162158
# Reset (for mtr internal checks)
163159
--disable_query_log
160+
161+
SET @@global.wsrep_sst_auth= @wsrep_sst_auth_saved;
164162
SET GLOBAL wsrep_slave_threads= @wsrep_slave_threads_saved;
165163
eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER';
166164
SET GLOBAL wsrep_cluster_address= @wsrep_cluster_address_saved;

0 commit comments

Comments
 (0)