Skip to content

Commit caa9d37

Browse files
committed
WL#16087: Remove the usage of the deprecated SHOW SLAVE STATUS command in tests and other components [Step 1]
This worklog removes the usage of SHOW SLAVE STATUS in tests files and other minor usages. It also renames most of the usage of its columns, like Slave_IO_State or Exec_Master_Log_Pos. Step 1: Remove the usage of SHOW SLAVE STATUS in MTR tests and related files Change-Id: If243034d7eacef0bbae737e85731332ff9cdb3cf
1 parent 9ef500f commit caa9d37

File tree

366 files changed

+1993
-2005
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

366 files changed

+1993
-2005
lines changed

mysql-test/extra/binlog_tests/gtid_next_single_stmt_trx_rollback_with_non-trans_table.test

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ INSERT INTO t1_c VALUES (1), (2);
4040
--error ER_TABLE_EXISTS_ERROR
4141
CREATE TABLE t1(c1 INT, c2 INT);
4242

43-
--let $assert_text= rollback gtid MASTER_UUID:1
43+
--let $assert_text= rollback gtid Source_UUID:1
4444
--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = ""
4545
--source include/assert.inc
4646

@@ -50,7 +50,7 @@ CREATE TABLE t1(c1 INT, c2 INT);
5050
--error ER_NO_SUCH_TABLE
5151
ALTER TABLE t2 ADD COLUMN other_column INT;
5252

53-
--let $assert_text= rollback gtid MASTER_UUID:2
53+
--let $assert_text= rollback gtid Source_UUID:2
5454
--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = ""
5555
--source include/assert.inc
5656

@@ -60,7 +60,7 @@ ALTER TABLE t2 ADD COLUMN other_column INT;
6060
--error ER_BAD_TABLE_ERROR
6161
DROP TABLE t2;
6262

63-
--let $assert_text= rollback gtid MASTER_UUID:3
63+
--let $assert_text= rollback gtid Source_UUID:3
6464
--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = ""
6565
--source include/assert.inc
6666

@@ -70,7 +70,7 @@ DROP TABLE t2;
7070
--error ER_DUP_KEYNAME
7171
CREATE INDEX t_index ON t1(c1);
7272

73-
--let $assert_text= rollback gtid MASTER_UUID:4
73+
--let $assert_text= rollback gtid Source_UUID:4
7474
--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = ""
7575
--source include/assert.inc
7676

@@ -80,7 +80,7 @@ CREATE INDEX t_index ON t1(c1);
8080
--error ER_CANT_DROP_FIELD_OR_KEY
8181
DROP INDEX t_index2 ON t1;
8282

83-
--let $assert_text= rollback gtid MASTER_UUID:5
83+
--let $assert_text= rollback gtid Source_UUID:5
8484
--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = ""
8585
--source include/assert.inc
8686

@@ -90,7 +90,7 @@ DROP INDEX t_index2 ON t1;
9090
--error ER_NO_SUCH_TABLE
9191
RENAME TABLE t3 TO t4;
9292

93-
--let $assert_text= rollback gtid MASTER_UUID:6
93+
--let $assert_text= rollback gtid Source_UUID:6
9494
--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = ""
9595
--source include/assert.inc
9696

@@ -100,7 +100,7 @@ RENAME TABLE t3 TO t4;
100100
--error ER_TABLE_EXISTS_ERROR
101101
CREATE TEMPORARY TABLE temp1(c1 INT);
102102

103-
--let $assert_text= rollback gtid MASTER_UUID:7
103+
--let $assert_text= rollback gtid Source_UUID:7
104104
--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = ""
105105
--source include/assert.inc
106106

@@ -110,7 +110,7 @@ CREATE TEMPORARY TABLE temp1(c1 INT);
110110
--error ER_DUP_FIELDNAME
111111
ALTER TABLE temp1 ADD COLUMN other_column INT;
112112

113-
--let $assert_text= rollback gtid MASTER_UUID:8
113+
--let $assert_text= rollback gtid Source_UUID:8
114114
--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = ""
115115
--source include/assert.inc
116116

@@ -120,7 +120,7 @@ ALTER TABLE temp1 ADD COLUMN other_column INT;
120120
--error ER_BAD_TABLE_ERROR
121121
DROP TEMPORARY TABLE temp2;
122122

123-
--let $assert_text= rollback gtid MASTER_UUID:9
123+
--let $assert_text= rollback gtid Source_UUID:9
124124
--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = ""
125125
--source include/assert.inc
126126

@@ -130,18 +130,18 @@ DROP TEMPORARY TABLE temp2;
130130
--error ER_DB_CREATE_EXISTS
131131
CREATE DATABASE db1;
132132

133-
--let $assert_text= rollback gtid MASTER_UUID:10
133+
--let $assert_text= rollback gtid Source_UUID:10
134134
--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = ""
135135
--source include/assert.inc
136136

137137
# We disable the case due to differnces between
138138
# linux and windows in the results
139139
# Check-11: Roll back a failed ALTER DATABASE
140-
#--replace_result $master_uuid MASTER_UUID
140+
#--replace_result $master_uuid Source_UUID
141141
#--eval SET SESSION GTID_NEXT='$master_uuid:11'
142142
#--error 1
143143
#ALTER DATABASE db2 DEFAULT CHARACTER SET utf8mb3;
144-
#--let $assert_text= rollback gtid MASTER_UUID:11
144+
#--let $assert_text= rollback gtid Source_UUID:11
145145
#--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = ""
146146
#--source include/assert.inc
147147

@@ -151,7 +151,7 @@ CREATE DATABASE db1;
151151
--error ER_DB_DROP_EXISTS
152152
DROP DATABASE db2;
153153

154-
--let $assert_text= rollback gtid MASTER_UUID:12
154+
--let $assert_text= rollback gtid Source_UUID:12
155155
--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = ""
156156
--source include/assert.inc
157157

@@ -170,7 +170,7 @@ DROP DATABASE db2;
170170
--error ER_CANNOT_USER
171171
CREATE USER user1;
172172

173-
--let $assert_text= rollback gtid MASTER_UUID:13
173+
--let $assert_text= rollback gtid Source_UUID:13
174174
--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = ""
175175
--source include/assert.inc
176176

@@ -180,7 +180,7 @@ CREATE USER user1;
180180
--error ER_CANNOT_USER
181181
ALTER USER user2 IDENTIFIED BY 'passwd';
182182

183-
--let $assert_text= rollback gtid MASTER_UUID:14
183+
--let $assert_text= rollback gtid Source_UUID:14
184184
--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = ""
185185
--source include/assert.inc
186186

@@ -190,7 +190,7 @@ ALTER USER user2 IDENTIFIED BY 'passwd';
190190
--error ER_PASSWORD_NO_MATCH
191191
GRANT ALL ON *.* TO user2;
192192

193-
--let $assert_text= rollback gtid MASTER_UUID:15
193+
--let $assert_text= rollback gtid Source_UUID:15
194194
--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = ""
195195
--source include/assert.inc
196196

@@ -200,7 +200,7 @@ GRANT ALL ON *.* TO user2;
200200
--error ER_NONEXISTING_GRANT
201201
REVOKE ALL PRIVILEGES ON *.* FROM user2;
202202

203-
--let $assert_text= rollback gtid MASTER_UUID:16
203+
--let $assert_text= rollback gtid Source_UUID:16
204204
--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = ""
205205
--source include/assert.inc
206206

@@ -211,7 +211,7 @@ REVOKE ALL PRIVILEGES ON *.* FROM user2;
211211
DROP USER user2;
212212
--enable_testcase
213213

214-
--let $assert_text= rollback gtid MASTER_UUID:17
214+
--let $assert_text= rollback gtid Source_UUID:17
215215
--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = ""
216216
--source include/assert.inc
217217

@@ -221,7 +221,7 @@ DROP USER user2;
221221
--error ER_BAD_TABLE_ERROR
222222
DROP VIEW v2;
223223

224-
--let $assert_text= rollback gtid MASTER_UUID:18
224+
--let $assert_text= rollback gtid Source_UUID:18
225225
--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = ""
226226
--source include/assert.inc
227227

@@ -231,7 +231,7 @@ DROP VIEW v2;
231231
--error ER_TABLE_EXISTS_ERROR
232232
CREATE VIEW v1 as SELECT 1;
233233

234-
--let $assert_text= rollback gtid MASTER_UUID:19
234+
--let $assert_text= rollback gtid Source_UUID:19
235235
--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = ""
236236
--source include/assert.inc
237237

@@ -242,7 +242,7 @@ CREATE VIEW v1 as SELECT 1;
242242
--error ER_DUP_ENTRY
243243
INSERT INTO t1 VALUES (3), (2);
244244

245-
--let $assert_text= rollback gtid MASTER_UUID:20
245+
--let $assert_text= rollback gtid Source_UUID:20
246246
--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = ""
247247
--source include/assert.inc
248248

@@ -253,7 +253,7 @@ INSERT INTO t1 VALUES (3), (2);
253253
--error ER_DUP_ENTRY
254254
INSERT INTO t1 SELECT * FROM t1;
255255

256-
--let $assert_text= rollback gtid MASTER_UUID:21
256+
--let $assert_text= rollback gtid Source_UUID:21
257257
--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = ""
258258
--source include/assert.inc
259259

@@ -264,7 +264,7 @@ INSERT INTO t1 SELECT * FROM t1;
264264
--error ER_DUP_ENTRY
265265
INSERT INTO t1 VALUES (2), (3);
266266

267-
--let $assert_text= commit gtid MASTER_UUID:22
267+
--let $assert_text= commit gtid Source_UUID:22
268268
--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = "$master_uuid:22"
269269
--source include/assert.inc
270270

@@ -275,7 +275,7 @@ INSERT INTO t1 VALUES (2), (3);
275275
--error ER_DUP_ENTRY
276276
INSERT INTO t1 SELECT * FROM t1_c;
277277

278-
--let $assert_text= commit gtid MASTER_UUID:23
278+
--let $assert_text= commit gtid Source_UUID:23
279279
--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = "$master_uuid:22-23"
280280
--source include/assert.inc
281281

@@ -286,7 +286,7 @@ INSERT INTO t1 SELECT * FROM t1_c;
286286
--error ER_DUP_ENTRY
287287
UPDATE t1 SET c1=2 WHERE c1=1;
288288

289-
--let $assert_text= rollback gtid MASTER_UUID:24
289+
--let $assert_text= rollback gtid Source_UUID:24
290290
--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = "$master_uuid:22-23"
291291
--source include/assert.inc
292292

@@ -297,7 +297,7 @@ UPDATE t1 SET c1=2 WHERE c1=1;
297297
--error ER_DUP_ENTRY
298298
UPDATE t1_c, t1 SET t1_c.c1=3, t1.c1=2 WHERE t1_c.c1=1 AND t1.c1=1;
299299

300-
--let $assert_text= commit gtid MASTER_UUID:25
300+
--let $assert_text= commit gtid Source_UUID:25
301301
--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = "$master_uuid:22-23:25"
302302
--source include/assert.inc
303303

@@ -308,19 +308,19 @@ UPDATE t1_c, t1 SET t1_c.c1=3, t1.c1=2 WHERE t1_c.c1=1 AND t1.c1=1;
308308
--error ER_DUP_ENTRY
309309
UPDATE t1, t1_c SET t1.c1=2, t1_c.c1=3 WHERE t1.c1=1 OR t1_c.c1=1;
310310

311-
--let $assert_text= rollback gtid MASTER_UUID:26
311+
--let $assert_text= rollback gtid Source_UUID:26
312312
--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = "$master_uuid:22-23:25"
313313
--source include/assert.inc
314314

315315
# In ps protocol, the test case failed. Bug#21679228 is addressing it.
316316
# Check-27: Roll back a failed DELETE, the single stmt trx does not modify
317317
# non-trans table, so its owned gtid is rolled back.
318-
#--replace_result $master_uuid MASTER_UUID
318+
#--replace_result $master_uuid Source_UUID
319319
#--eval SET SESSION GTID_NEXT='$master_uuid:27'
320320
#--error ER_NO_SUCH_TABLE
321321
#DELETE FROM t2 WHERE c1=100;
322322

323-
#--let $assert_text= rollback gtid MASTER_UUID:27
323+
#--let $assert_text= rollback gtid Source_UUID:27
324324
#--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = "$master_uuid:22-23:25"
325325
#--source include/assert.inc
326326

0 commit comments

Comments
 (0)