mirror of
https://github.com/MariaDB/server.git
synced 2025-01-27 17:33:44 +01:00
8ce9b99246
In SBR, if a statement does not fail, it is always written to the binary log, regardless if rows are changed or not. If there is a failure, a statement is only written to the binary log if a non-transactional (.e.g. MyIsam) engine is updated. INSERT ON DUPLICATE KEY UPDATE and INSERT IGNORE were not following the rule above and were not written to the binary log, if then engine was Innodb. mysql-test/extra/rpl_tests/rpl_insert_duplicate.test: Added test case. mysql-test/extra/rpl_tests/rpl_insert_ignore.test: Updated test case. mysql-test/include/commit.inc: Updated test case as the calls to the binary log have changed for INSERT ON DUPLICATE and INSERT IGNORE. mysql-test/r/commit_1innodb.result: Updated result file. mysql-test/suite/rpl/r/rpl_insert_duplicate.result: Added test case. mysql-test/suite/rpl/r/rpl_insert_ignore.result: Updated result file. mysql-test/suite/rpl/t/rpl_insert_duplicate.test: Added test case. mysql-test/suite/rpl/t/rpl_insert_ignore.test: Improved test case.
55 lines
2 KiB
Text
55 lines
2 KiB
Text
include/master-slave.inc
|
|
[connection master]
|
|
CREATE TABLE t1 (
|
|
a int unsigned not null auto_increment primary key,
|
|
b int unsigned,
|
|
unique (b)
|
|
) ENGINE=innodb;
|
|
CREATE TABLE t2 (
|
|
a int unsigned, # to force INSERT SELECT to have a certain order
|
|
b int unsigned
|
|
) ENGINE=innodb;
|
|
INSERT INTO t1 VALUES (NULL, 1);
|
|
INSERT INTO t1 VALUES (NULL, 2);
|
|
INSERT INTO t1 VALUES (NULL, 3);
|
|
INSERT INTO t1 VALUES (NULL, 4);
|
|
INSERT INTO t2 VALUES (1, 1);
|
|
INSERT INTO t2 VALUES (2, 2);
|
|
INSERT INTO t2 VALUES (3, 5);
|
|
INSERT INTO t2 VALUES (4, 3);
|
|
INSERT INTO t2 VALUES (5, 4);
|
|
INSERT INTO t2 VALUES (6, 6);
|
|
INSERT IGNORE INTO t1 SELECT NULL, t2.b FROM t2 ORDER BY t2.a;
|
|
include/assert.inc [Count of elements in t1 should be 6.]
|
|
include/diff_tables.inc [master:test.t1 , slave:test.t1]
|
|
INSERT IGNORE INTO t1 SELECT NULL, t2.b FROM t2 ORDER BY t2.a;
|
|
include/assert.inc [Count of elements in t1 should be 6.]
|
|
include/assert.inc [In SBR or MIXED modes, the event in the binlog should be the same that was executed. In RBR mode, binlog position should stay unchanged.]
|
|
drop table t1, t2;
|
|
CREATE TABLE t1 (
|
|
a int unsigned not null auto_increment primary key,
|
|
b int unsigned,
|
|
unique (b)
|
|
) ENGINE=innodb;
|
|
CREATE TABLE t2 (
|
|
a int unsigned, # to force INSERT SELECT to have a certain order
|
|
b int unsigned
|
|
) ENGINE=innodb;
|
|
INSERT INTO t1 VALUES (NULL, 1);
|
|
INSERT INTO t1 VALUES (NULL, 2);
|
|
INSERT INTO t1 VALUES (NULL, 3);
|
|
INSERT INTO t1 VALUES (NULL, 4);
|
|
INSERT INTO t2 VALUES (1, 1);
|
|
INSERT INTO t2 VALUES (2, 2);
|
|
INSERT INTO t2 VALUES (3, 5);
|
|
INSERT INTO t2 VALUES (4, 3);
|
|
INSERT INTO t2 VALUES (5, 4);
|
|
INSERT INTO t2 VALUES (6, 6);
|
|
INSERT IGNORE INTO t1 SELECT NULL, t2.b FROM t2 ORDER BY t2.a;
|
|
include/assert.inc [Count of elements in t1 should be 6.]
|
|
include/diff_tables.inc [master:test.t1 , slave:test.t1]
|
|
INSERT IGNORE INTO t1 SELECT NULL, t2.b FROM t2 ORDER BY t2.a;
|
|
include/assert.inc [Count of elements in t1 should be 6.]
|
|
include/assert.inc [In SBR or MIXED modes, the event in the binlog should be the same that was executed. In RBR mode, binlog position should stay unchanged.]
|
|
drop table t1, t2;
|
|
include/rpl_end.inc
|