mirror of
https://github.com/MariaDB/server.git
synced 2025-11-09 23:36:13 +01:00
0a68328673
This is actually an existing problem in the old binlog implementation, and this patch is applicable to old binlog also. The problem is that RESET MASTER can run concurrently with binlog dump threads / connected slaves. This will remove the binlog from under the feet of the reader, which can cause all sorts of strange behaviour. This patch fixes the problem by disallowing to run RESET MASTER when dump threads (or other RESET MASTER or SHOW BINARY LOGS) are running. An error is thrown in this case, user must stop slaves and/or kill dump threads to make the RESET MASTER go through. A slave that connects in the middle of RESET MASTER will wait for it to complete. Fix a lot of test cases to kill any lingering dump threads before doing RESET MASTER, mostly just by sourcing include/kill_binlog_dump_threads.inc. Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
201 lines
6.5 KiB
Text
201 lines
6.5 KiB
Text
include/master-slave.inc
|
|
[connection master]
|
|
# Case 1: UNSAFE
|
|
call mtr.add_suppression("Unsafe statement written to the binary log using statement format");
|
|
CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY , b INT,
|
|
UNIQUE(b), c int) engine=innodb;
|
|
connection slave;
|
|
connection master;
|
|
INSERT INTO t1 VALUES (1, 1, 1);
|
|
BEGIN;
|
|
INSERT INTO t1 VALUES (2, 1, 2) ON DUPLICATE KEY UPDATE b=VALUES(b), c=VALUES(c);
|
|
Warnings:
|
|
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. INSERT... ON DUPLICATE KEY UPDATE on a table with more than one UNIQUE KEY is unsafe
|
|
connection master1;
|
|
INSERT INTO t1 VALUES(2, 2, 3) ON DUPLICATE KEY UPDATE b=VALUES(b), c=VALUES(c);
|
|
Warnings:
|
|
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. INSERT... ON DUPLICATE KEY UPDATE on a table with more than one UNIQUE KEY is unsafe
|
|
connection master;
|
|
COMMIT;
|
|
SELECT * FROM t1;
|
|
a b c
|
|
1 1 2
|
|
2 2 3
|
|
connection slave;
|
|
include/wait_for_slave_sql_error.inc [errno=1062]
|
|
Last_SQL_Error = 'Error 'Duplicate entry '1' for key 'b'' on query. Default database: 'test'. Query: 'INSERT INTO t1 VALUES (2, 1, 2) ON DUPLICATE KEY UPDATE b=VALUES(b), c=VALUES(c)''
|
|
#Different value from server
|
|
SELECT * FROM t1;
|
|
a b c
|
|
1 1 1
|
|
2 2 3
|
|
include/stop_slave_io.inc
|
|
include/reset_slave.inc
|
|
connection master;
|
|
include/kill_binlog_dump_threads.inc
|
|
reset master;
|
|
drop table t1;
|
|
connection slave;
|
|
start slave;
|
|
include/wait_for_slave_to_start.inc
|
|
# Case 2: UNSAFE
|
|
connection master;
|
|
CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY auto_increment, b INT,
|
|
UNIQUE(b), c int) engine=innodb;
|
|
connection slave;
|
|
connection master;
|
|
INSERT INTO t1 VALUES (default, 1, 1);
|
|
BEGIN;
|
|
INSERT INTO t1 VALUES (default, 1, 2) ON DUPLICATE KEY UPDATE b=VALUES(b), c=VALUES(c);
|
|
Warnings:
|
|
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. INSERT... ON DUPLICATE KEY UPDATE on a table with more than one UNIQUE KEY is unsafe
|
|
connection master1;
|
|
INSERT INTO t1 VALUES(default, 2, 3) ON DUPLICATE KEY UPDATE b=VALUES(b), c=VALUES(c);
|
|
Warnings:
|
|
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. INSERT... ON DUPLICATE KEY UPDATE on a table with more than one UNIQUE KEY is unsafe
|
|
connection master;
|
|
COMMIT;
|
|
SELECT * FROM t1;
|
|
a b c
|
|
1 1 2
|
|
3 2 3
|
|
connection slave;
|
|
#same data as master
|
|
SELECT * FROM t1;
|
|
a b c
|
|
1 1 2
|
|
3 2 3
|
|
connection master;
|
|
drop table t1;
|
|
connection slave;
|
|
# Case 3A: UNSAFE
|
|
connection master;
|
|
CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY, b INT,
|
|
UNIQUE(b), c int, d int ) engine=innodb;
|
|
connection slave;
|
|
connection master;
|
|
INSERT INTO t1 VALUES (1, 1, 1, 1);
|
|
BEGIN;
|
|
INSERT INTO t1 VALUES (2, NULL, 2, 2) ON DUPLICATE KEY UPDATE b=VALUES(b), c=VALUES(c);
|
|
Warnings:
|
|
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. INSERT... ON DUPLICATE KEY UPDATE on a table with more than one UNIQUE KEY is unsafe
|
|
connection master1;
|
|
INSERT INTO t1 VALUES(3, NULL, 2, 3) ON DUPLICATE KEY UPDATE b=VALUES(b), c=VALUES(c);
|
|
Warnings:
|
|
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. INSERT... ON DUPLICATE KEY UPDATE on a table with more than one UNIQUE KEY is unsafe
|
|
connection master;
|
|
COMMIT;
|
|
SELECT * FROM t1;
|
|
a b c d
|
|
1 1 1 1
|
|
2 NULL 2 2
|
|
3 NULL 2 3
|
|
connection slave;
|
|
#same data as master
|
|
SELECT * FROM t1;
|
|
a b c d
|
|
1 1 1 1
|
|
2 NULL 2 2
|
|
3 NULL 2 3
|
|
connection master;
|
|
drop table t1;
|
|
connection slave;
|
|
# Case 3B: UNSAFE - all column specified.
|
|
connection master;
|
|
CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY, b INT,
|
|
UNIQUE(b), c int, d int ) engine=innodb;
|
|
connection slave;
|
|
connection master;
|
|
INSERT INTO t1 VALUES (1, 1, 1, 1);
|
|
BEGIN;
|
|
INSERT INTO t1 VALUES (2, NULL, 2, 2) ON DUPLICATE KEY UPDATE c=VALUES(c);
|
|
Warnings:
|
|
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. INSERT... ON DUPLICATE KEY UPDATE on a table with more than one UNIQUE KEY is unsafe
|
|
connection master1;
|
|
INSERT INTO t1 VALUES(3, NULL, 2, 3) ON DUPLICATE KEY UPDATE c=VALUES(c);
|
|
Warnings:
|
|
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. INSERT... ON DUPLICATE KEY UPDATE on a table with more than one UNIQUE KEY is unsafe
|
|
connection master;
|
|
COMMIT;
|
|
SELECT * FROM t1;
|
|
a b c d
|
|
1 1 1 1
|
|
2 NULL 2 2
|
|
3 NULL 2 3
|
|
connection slave;
|
|
#same data as master
|
|
SELECT * FROM t1;
|
|
a b c d
|
|
1 1 1 1
|
|
2 NULL 2 2
|
|
3 NULL 2 3
|
|
connection master;
|
|
drop table t1;
|
|
connection slave;
|
|
# Case 3C: SAFE - only one unique key (PK) specified.
|
|
connection master;
|
|
CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY, b INT,
|
|
UNIQUE(b), c int, d int ) engine=innodb;
|
|
connection slave;
|
|
connection master;
|
|
INSERT INTO t1 VALUES (1, 1, 1, 1);
|
|
BEGIN;
|
|
INSERT INTO t1 (`a`, `c`, `d`) VALUES (2, 2, 2) ON DUPLICATE KEY UPDATE c=99;
|
|
connection master1;
|
|
INSERT INTO t1 (`a`, `c`, `d`) VALUES(3, 2, 3) ON DUPLICATE KEY UPDATE c=100;
|
|
connection master;
|
|
COMMIT;
|
|
SELECT * FROM t1;
|
|
a b c d
|
|
1 1 1 1
|
|
2 NULL 2 2
|
|
3 NULL 2 3
|
|
connection slave;
|
|
#same data as master
|
|
SELECT * FROM t1;
|
|
a b c d
|
|
1 1 1 1
|
|
2 NULL 2 2
|
|
3 NULL 2 3
|
|
connection master;
|
|
drop table t1;
|
|
connection slave;
|
|
# Case 4: UNSAFE
|
|
connection master;
|
|
CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY auto_increment, b INT,
|
|
UNIQUE(b), c int) engine=innodb;
|
|
connection slave;
|
|
connection master;
|
|
INSERT INTO t1 VALUES (1, 1, 1);
|
|
BEGIN;
|
|
INSERT INTO t1 VALUES (2, 1, 2) ON DUPLICATE KEY UPDATE b=VALUES(b), c=VALUES(c);
|
|
Warnings:
|
|
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. INSERT... ON DUPLICATE KEY UPDATE on a table with more than one UNIQUE KEY is unsafe
|
|
connection master1;
|
|
INSERT INTO t1 VALUES(2, 2, 3) ON DUPLICATE KEY UPDATE b=VALUES(b), c=VALUES(c);
|
|
Warnings:
|
|
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. INSERT... ON DUPLICATE KEY UPDATE on a table with more than one UNIQUE KEY is unsafe
|
|
connection master;
|
|
COMMIT;
|
|
SELECT * FROM t1;
|
|
a b c
|
|
1 1 2
|
|
2 2 3
|
|
connection slave;
|
|
include/wait_for_slave_sql_error.inc [errno=1062]
|
|
Last_SQL_Error = 'Error 'Duplicate entry '1' for key 'b'' on query. Default database: 'test'. Query: 'INSERT INTO t1 VALUES (2, 1, 2) ON DUPLICATE KEY UPDATE b=VALUES(b), c=VALUES(c)''
|
|
#Different value from server
|
|
SELECT * FROM t1;
|
|
a b c
|
|
1 1 1
|
|
2 2 3
|
|
include/stop_slave_io.inc
|
|
include/reset_slave.inc
|
|
connection master;
|
|
include/kill_binlog_dump_threads.inc
|
|
reset master;
|
|
drop table t1;
|
|
connection slave;
|
|
start slave;
|
|
include/wait_for_slave_to_start.inc
|
|
include/rpl_end.inc
|