Skip to content

Commit f7adf12

Browse files
grooverdangrooverdan
committed
MDEV-4827: prelude - additional gtid/no-gtid tests for mysqldump
This will make it easier to show changes.
1 parent 5e70470 commit f7adf12

File tree

2 files changed

+163
-14
lines changed

2 files changed

+163
-14
lines changed

‎mysql-test/main/rpl_mysqldump_slave.result‎

Lines changed: 113 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ CHANGE MASTER '' TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_S
2525
start slave;
2626
Warnings:
2727
Note 1254 Slave is already running
28-
*** Test mysqldump --dump-slave GTID functionality.
28+
*** Test mysqldump --dump-slave GTID/non-gtid functionality.
2929
connection master;
3030
SET gtid_seq_no = 1000;
3131
CREATE TABLE t1 (a INT PRIMARY KEY);
@@ -35,36 +35,142 @@ connection slave;
3535
CREATE TABLE t2 (a INT PRIMARY KEY);
3636
DROP TABLE t2;
3737

38-
1. --dump-slave=1
38+
1. --dump-slave=1 --gtid
3939

4040
SET GLOBAL gtid_slave_pos='0-1-1001';
4141
CHANGE MASTER '' TO MASTER_USE_GTID=slave_pos;
4242
-- CHANGE MASTER '' TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
4343

44-
2. --dump-slave=2
44+
1a. --dump-slave=1
45+
46+
-- SET GLOBAL gtid_slave_pos='0-1-1001';
47+
CHANGE MASTER '' TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
48+
49+
2. --dump-slave=2 --gtid
4550

4651
-- SET GLOBAL gtid_slave_pos='0-1-1001';
4752
-- CHANGE MASTER '' TO MASTER_USE_GTID=slave_pos;
4853
-- CHANGE MASTER '' TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
49-
*** Test mysqldump --master-data GTID functionality.
5054

51-
1. --master-data=1
55+
2. --dump-slave=2
56+
57+
-- SET GLOBAL gtid_slave_pos='0-1-1001';
58+
-- CHANGE MASTER '' TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
59+
*** Test mysqldump --master-data GTID/non-gtid functionality.
60+
61+
1. --master-data=1 --gtid
5262

5363
-- CHANGE MASTER TO MASTER_LOG_FILE='slave-bin.000001', MASTER_LOG_POS=BINLOG_START;
5464
CHANGE MASTER TO MASTER_USE_GTID=slave_pos;
5565
SET GLOBAL gtid_slave_pos='0-2-1003';
5666

57-
2. --master-data=2
67+
1a. --master-data=1
68+
69+
CHANGE MASTER TO MASTER_LOG_FILE='slave-bin.000001', MASTER_LOG_POS=BINLOG_START;
70+
-- SET GLOBAL gtid_slave_pos='0-2-1003';
71+
72+
2. --master-data=2 --gtid
5873

5974
-- CHANGE MASTER TO MASTER_LOG_FILE='slave-bin.000001', MASTER_LOG_POS=BINLOG_START;
6075
-- CHANGE MASTER TO MASTER_USE_GTID=slave_pos;
6176
-- SET GLOBAL gtid_slave_pos='0-2-1003';
6277

63-
3. --master-data --single-transaction
78+
2a. --master-data=2
79+
80+
-- CHANGE MASTER TO MASTER_LOG_FILE='slave-bin.000001', MASTER_LOG_POS=BINLOG_START;
81+
-- SET GLOBAL gtid_slave_pos='0-2-1003';
82+
83+
3. --master-data --single-transaction --gtid
6484

6585
-- CHANGE MASTER TO MASTER_LOG_FILE='slave-bin.000001', MASTER_LOG_POS=BINLOG_START;
6686
CHANGE MASTER TO MASTER_USE_GTID=slave_pos;
6787
SET GLOBAL gtid_slave_pos='0-2-1003';
88+
89+
3a. --master-data --single-transaction
90+
91+
CHANGE MASTER TO MASTER_LOG_FILE='slave-bin.000001', MASTER_LOG_POS=BINLOG_START;
92+
-- SET GLOBAL gtid_slave_pos='0-2-1003';
93+
94+
4. --master-data=2 --dump-slave=2 --single-transaction --gtid (MDEV-4827)
95+
96+
-- MariaDB dump--
97+
-- Host: localhost Database: test
98+
-- ------------------------------------------------------
99+
-- Server version
100+
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
101+
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
102+
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
103+
/*!40101 SET NAMES utf8mb4 */;
104+
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
105+
/*!40103 SET TIME_ZONE='+00:00' */;
106+
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
107+
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
108+
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
109+
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
110+
111+
--
112+
-- Gtid position to start replication from
113+
--
114+
115+
-- SET GLOBAL gtid_slave_pos='0-1-1001';
116+
-- CHANGE MASTER '' TO MASTER_USE_GTID=slave_pos;
117+
118+
--
119+
-- Position to start replication or point-in-time recovery from (the master of this slave)
120+
--
121+
122+
-- CHANGE MASTER '' TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
123+
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
124+
125+
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
126+
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
127+
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
128+
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
129+
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
130+
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
131+
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
132+
133+
-- Dump completed
134+
135+
4a. --master-data=2 --dump-slave=2 --single-transaction (MDEV-4827)
136+
137+
-- MariaDB dump--
138+
-- Host: localhost Database: test
139+
-- ------------------------------------------------------
140+
-- Server version
141+
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
142+
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
143+
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
144+
/*!40101 SET NAMES utf8mb4 */;
145+
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
146+
/*!40103 SET TIME_ZONE='+00:00' */;
147+
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
148+
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
149+
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
150+
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
151+
152+
--
153+
-- Gtid position to start replication from
154+
--
155+
156+
-- SET GLOBAL gtid_slave_pos='0-1-1001';
157+
158+
--
159+
-- Position to start replication or point-in-time recovery from (the master of this slave)
160+
--
161+
162+
-- CHANGE MASTER '' TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
163+
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
164+
165+
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
166+
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
167+
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
168+
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
169+
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
170+
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
171+
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
172+
173+
-- Dump completed
68174
connection master;
69175
CREATE TABLE t (
70176
id int

‎mysql-test/main/rpl_mysqldump_slave.test‎

Lines changed: 50 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ start slave;
3737
start slave;
3838

3939

40-
--echo *** Test mysqldump --dump-slave GTID functionality.
40+
--echo *** Test mysqldump --dump-slave GTID/non-gtid functionality.
4141

4242
--connection master
4343
SET gtid_seq_no = 1000;
@@ -52,37 +52,80 @@ CREATE TABLE t2 (a INT PRIMARY KEY);
5252
DROP TABLE t2;
5353

5454
--echo
55-
--echo 1. --dump-slave=1
55+
--echo 1. --dump-slave=1 --gtid
5656
--echo
5757
--replace_regex /MASTER_LOG_POS=[0-9]+/MASTER_LOG_POS=BINLOG_START/
5858
--exec $MYSQL_DUMP_SLAVE --compact --dump-slave=1 --gtid test
5959

6060
--echo
61-
--echo 2. --dump-slave=2
61+
--echo 1a. --dump-slave=1
62+
--echo
63+
--replace_regex /MASTER_LOG_POS=[0-9]+/MASTER_LOG_POS=BINLOG_START/
64+
--exec $MYSQL_DUMP_SLAVE --compact --dump-slave=1 test
65+
66+
--echo
67+
--echo 2. --dump-slave=2 --gtid
6268
--echo
6369
--replace_regex /MASTER_LOG_POS=[0-9]+/MASTER_LOG_POS=BINLOG_START/
6470
--exec $MYSQL_DUMP_SLAVE --compact --dump-slave=2 --gtid test
6571

72+
--echo
73+
--echo 2. --dump-slave=2
74+
--echo
75+
--replace_regex /MASTER_LOG_POS=[0-9]+/MASTER_LOG_POS=BINLOG_START/
76+
--exec $MYSQL_DUMP_SLAVE --compact --dump-slave=2 test
77+
6678

67-
--echo *** Test mysqldump --master-data GTID functionality.
79+
--echo *** Test mysqldump --master-data GTID/non-gtid functionality.
6880
--echo
69-
--echo 1. --master-data=1
81+
--echo 1. --master-data=1 --gtid
7082
--echo
7183
--replace_regex /MASTER_LOG_POS=[0-9]+/MASTER_LOG_POS=BINLOG_START/
7284
--exec $MYSQL_DUMP_SLAVE --compact --master-data=1 --gtid test
7385

7486
--echo
75-
--echo 2. --master-data=2
87+
--echo 1a. --master-data=1
88+
--echo
89+
--replace_regex /MASTER_LOG_POS=[0-9]+/MASTER_LOG_POS=BINLOG_START/
90+
--exec $MYSQL_DUMP_SLAVE --compact --master-data=1 test
91+
92+
--echo
93+
--echo 2. --master-data=2 --gtid
7694
--echo
7795
--replace_regex /MASTER_LOG_POS=[0-9]+/MASTER_LOG_POS=BINLOG_START/
7896
--exec $MYSQL_DUMP_SLAVE --compact --master-data=2 --gtid test
7997

8098
--echo
81-
--echo 3. --master-data --single-transaction
99+
--echo 2a. --master-data=2
100+
--echo
101+
--replace_regex /MASTER_LOG_POS=[0-9]+/MASTER_LOG_POS=BINLOG_START/
102+
--exec $MYSQL_DUMP_SLAVE --compact --master-data=2 test
103+
104+
--echo
105+
--echo 3. --master-data --single-transaction --gtid
82106
--echo
83107
--replace_regex /MASTER_LOG_POS=[0-9]+/MASTER_LOG_POS=BINLOG_START/
84108
--exec $MYSQL_DUMP_SLAVE --compact --master-data --single-transaction --gtid test
85109

110+
--echo
111+
--echo 3a. --master-data --single-transaction
112+
--echo
113+
--replace_regex /MASTER_LOG_POS=[0-9]+/MASTER_LOG_POS=BINLOG_START/
114+
--exec $MYSQL_DUMP_SLAVE --compact --master-data --single-transaction test
115+
116+
--echo
117+
--echo 4. --master-data=2 --dump-slave=2 --single-transaction --gtid (MDEV-4827)
118+
--echo
119+
--replace_regex /MASTER_LOG_POS=[0-9]+/MASTER_LOG_POS=BINLOG_START/ /MariaDB dump.*/MariaDB dump/ /Dump completed.*/Dump completed/ /Server version.*/Server version/
120+
--exec $MYSQL_DUMP_SLAVE --master-data=2 --dump-slave=2 --single-transaction --gtid test
121+
--echo
122+
123+
--echo
124+
--echo 4a. --master-data=2 --dump-slave=2 --single-transaction (MDEV-4827)
125+
--echo
126+
--replace_regex /MASTER_LOG_POS=[0-9]+/MASTER_LOG_POS=BINLOG_START/ /MariaDB dump.*/MariaDB dump/ /Dump completed.*/Dump completed/ /Server version.*/Server version/
127+
--exec $MYSQL_DUMP_SLAVE --master-data=2 --dump-slave=2 --single-transaction test
128+
--echo
86129
#
87130
# MDEV-32611 Added test for mysqldump --delete-master-logs option.
88131
# This options is alias of

0 commit comments

Comments
 (0)