Skip to content

Commit c0741f0

Browse files
author
Arun Kuruvila
committed
Merge branch 'mysql-5.6' into mysql-5.7
2 parents 71578e5 + f03eff1 commit c0741f0

8 files changed

+441
-15
lines changed

‎mysql-test/suite/rpl/r/rpl_gtid_drop_mem_table.result

+135
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
include/master-slave.inc
2+
Warnings:
3+
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
4+
Note #### Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
5+
[connection master]
6+
[connection master]
7+
CREATE TABLE mem_t1 (c1 INT) ENGINE= MEMORY;
8+
CREATE TABLE mem_t2 (c1 INT) ENGINE= MEMORY;
9+
CREATE TABLE mem_t3 (c1 INT) ENGINE= MEMORY;
10+
CREATE TABLE mem_t4 (c1 INT) ENGINE= MEMORY;
11+
CREATE TABLE mem_t5 (c1 INT) ENGINE= MEMORY;
12+
CREATE TABLE mem_t6 (c1 INT) ENGINE= MEMORY;
13+
CREATE TABLE mem_t7 (c1 INT) ENGINE= MEMORY;
14+
CREATE TABLE mem_t8 (c1 INT) ENGINE= MEMORY;
15+
INSERT INTO mem_t1 VALUES (1), (2), (3), (4);
16+
INSERT INTO mem_t2 VALUES (1), (2), (3), (4);
17+
INSERT INTO mem_t3 VALUES (1), (2), (3), (4);
18+
INSERT INTO mem_t4 VALUES (1), (2), (3), (4);
19+
INSERT INTO mem_t5 VALUES (1), (2), (3), (4);
20+
INSERT INTO mem_t6 VALUES (1), (2), (3), (4);
21+
INSERT INTO mem_t7 VALUES (1), (2), (3), (4);
22+
INSERT INTO mem_t8 VALUES (1), (2), (3), (4);
23+
include/sync_slave_sql_with_master.inc
24+
include/stop_slave.inc
25+
include/rpl_restart_server.inc [server_number=1]
26+
include/start_slave.inc
27+
[connection master]
28+
include/save_binlog_position.inc
29+
INSERT INTO mem_t1 VALUES (1), (2), (3), (4);
30+
include/sync_slave_sql_with_master.inc
31+
[connection master]
32+
include/assert_binlog_events.inc [#Gtid # !Begin # !Delete # !Commit #Gtid # !Begin # !Insert # !Commit]
33+
include/save_binlog_position.inc
34+
ALTER TABLE mem_t2 ADD COLUMN (c2 INT);
35+
include/sync_slave_sql_with_master.inc
36+
[connection master]
37+
include/assert_binlog_events.inc [#Gtid # !Begin # !Delete # !Commit #Gtid # !Q(ALTER.*)]
38+
include/save_binlog_position.inc
39+
CREATE TABLE mem_t9 LIKE mem_t3;
40+
include/sync_slave_sql_with_master.inc
41+
[connection master]
42+
include/assert_binlog_events.inc [#Gtid # !Begin # !Delete # !Commit #Gtid # !Q(CREATE.*)]
43+
include/save_binlog_position.inc
44+
BEGIN;
45+
INSERT INTO mem_t4 VALUES (1), (2), (3), (4);
46+
INSERT INTO mem_t5 VALUES (1), (2), (3), (4);
47+
COMMIT;
48+
include/sync_slave_sql_with_master.inc
49+
[connection master]
50+
include/assert_binlog_events.inc [#Gtid # !Begin # !Delete # !Commit #Gtid # !Begin # !Insert # !Commit #Gtid # !Begin # !Delete # !Commit #Gtid # !Begin # !Insert # !Commit]
51+
include/save_binlog_position.inc
52+
UPDATE mem_t6, mem_t7 SET mem_t6.c1 = mem_t6.c1 + 1, mem_t7.c1 = mem_t7.c1 + 1;
53+
include/sync_slave_sql_with_master.inc
54+
[connection master]
55+
include/assert_binlog_events.inc [#Gtid # !Begin # !Delete # !Commit #Gtid # !Begin # !Delete # !Commit]
56+
include/save_binlog_position.inc
57+
SET @@session.gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1';
58+
INSERT INTO mem_t8 VALUES (1), (2), (3), (4);
59+
SET @@session.gtid_next = 'AUTOMATIC';
60+
include/sync_slave_sql_with_master.inc
61+
[connection master]
62+
include/assert_binlog_events.inc [#Gtid # !Begin # !Delete # !Commit #Gtid/(.*'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1')# !Begin # !Insert # !Commit]
63+
DROP TABLE mem_t1, mem_t2, mem_t3, mem_t4, mem_t5, mem_t6, mem_t7, mem_t8, mem_t9;
64+
include/rpl_reset.inc
65+
[connection master]
66+
CREATE TABLE mem_t1 (c1 INT) ENGINE= MEMORY;
67+
CREATE TABLE mem_t2 (c1 INT) ENGINE= MEMORY;
68+
CREATE TABLE mem_t3 (c1 INT) ENGINE= MEMORY;
69+
CREATE TABLE mem_t4 (c1 INT) ENGINE= MEMORY;
70+
CREATE TABLE mem_t5 (c1 INT) ENGINE= MEMORY;
71+
CREATE TABLE mem_t6 (c1 INT) ENGINE= MEMORY;
72+
CREATE TABLE mem_t7 (c1 INT) ENGINE= MEMORY;
73+
CREATE TABLE mem_t8 (c1 INT) ENGINE= MEMORY;
74+
INSERT INTO mem_t1 VALUES (1), (2), (3), (4);
75+
INSERT INTO mem_t2 VALUES (1), (2), (3), (4);
76+
INSERT INTO mem_t3 VALUES (1), (2), (3), (4);
77+
INSERT INTO mem_t4 VALUES (1), (2), (3), (4);
78+
INSERT INTO mem_t5 VALUES (1), (2), (3), (4);
79+
INSERT INTO mem_t6 VALUES (1), (2), (3), (4);
80+
INSERT INTO mem_t7 VALUES (1), (2), (3), (4);
81+
INSERT INTO mem_t8 VALUES (1), (2), (3), (4);
82+
include/sync_slave_sql_with_master.inc
83+
include/rpl_restart_server.inc [server_number=2]
84+
include/start_slave.inc
85+
include/save_binlog_position.inc
86+
[connection master]
87+
[connection slave]
88+
[connection master]
89+
INSERT INTO mem_t1 VALUES (1), (2), (3), (4);
90+
include/sync_slave_sql_with_master.inc
91+
[connection slave]
92+
include/assert_binlog_events.inc
93+
include/save_binlog_position.inc
94+
[connection master]
95+
ALTER TABLE mem_t2 ADD COLUMN (c2 INT);
96+
include/sync_slave_sql_with_master.inc
97+
[connection slave]
98+
include/assert_binlog_events.inc
99+
include/save_binlog_position.inc
100+
[connection master]
101+
CREATE TABLE mem_t9 LIKE mem_t3;
102+
include/sync_slave_sql_with_master.inc
103+
[connection slave]
104+
include/assert_binlog_events.inc
105+
include/save_binlog_position.inc
106+
[connection master]
107+
BEGIN;
108+
INSERT INTO mem_t4 VALUES (1), (2), (3), (4);
109+
INSERT INTO mem_t5 VALUES (1), (2), (3), (4);
110+
COMMIT;
111+
include/sync_slave_sql_with_master.inc
112+
[connection slave]
113+
include/assert_binlog_events.inc
114+
include/save_binlog_position.inc
115+
[connection master]
116+
CREATE FUNCTION f () RETURNS INT BEGIN
117+
INSERT INTO mem_t6 VALUES (1);
118+
RETURN 2;
119+
END|
120+
INSERT INTO mem_t7 VALUES (f());
121+
include/sync_slave_sql_with_master.inc
122+
[connection slave]
123+
include/assert_binlog_events.inc
124+
include/save_binlog_position.inc
125+
[connection master]
126+
SET @@session.gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1';
127+
INSERT INTO mem_t8 VALUES (1), (2), (3), (4);
128+
SET @@session.gtid_next = 'AUTOMATIC';
129+
include/sync_slave_sql_with_master.inc
130+
[connection slave]
131+
include/assert_binlog_events.inc
132+
[connection master]
133+
DROP FUNCTION f;
134+
DROP TABLE mem_t1, mem_t2, mem_t3, mem_t4, mem_t5, mem_t6, mem_t7, mem_t8, mem_t9;
135+
include/rpl_end.inc

‎mysql-test/suite/rpl/t/rpl_gtid_delete_memory_table_after_start_server.test

+5
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@
3232
# The test cases verify above statements can binlog 'DELETE' statement
3333
# correctly. A few extra test cases were added to verify some special
3434
# situations that updating or modifying a memory table.
35+
#
36+
# The test cases in this file will verify only when gtid mode is on.
37+
#
38+
# See rpl_no_gtid_delete_memory_table_after_start_server.test for the tests with
39+
# gtid_mode=off.
3540
################################################################################
3641
--source include/not_group_replication_plugin.inc
3742
--source include/mysql_have_debug.inc

‎mysql-test/suite/rpl/t/rpl_gtid_drop_mem_table.cnf

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
!include ../my.cnf
2+
3+
[mysqld.1]
4+
gtid-mode=on
5+
enforce-gtid-consistency
6+
log-slave-updates
7+
8+
[mysqld.2]
9+
gtid-mode=on
10+
enforce-gtid-consistency
11+
log-slave-updates

0 commit comments

Comments
 (0)