Fix for BUG#25507 "multi-row insert delayed + auto increment causes
duplicate key entries on slave" (two concurrrent connections doing
multi-row INSERT DELAYED to insert into an auto_increment column,
caused replication slave to stop with "duplicate key error" (and
binlog was wrong)), and BUG#26116 "If multi-row INSERT
DELAYED has errors, statement-based binlogging breaks" (the binlog
was not accounting for all rows inserted, or slave could stop).
The fix is that: if (statement-based) binlogging is on, a multi-row
INSERT DELAYED is silently converted to a non-delayed INSERT.
Note: it is not possible to test BUG#25507 in 5.0 (requires mysqlslap),
so it is tested only in the changeset for 5.1. However, BUG#26116
is tested here, and the fix for BUG#25507 is the same code change.
mysql-test/r/innodb-replace.result:
result update
mysql-test/t/innodb-replace.test:
now that multi-row delayed inserts are converted to normal inserts
if the statement-based binlog is enabled,
no error is issued even if this engine does not support INSERT DELAYED,
as the insert does not go through the INSERT DELAYED code.
To preserve the goal of this test, we change the statements to single-
row inserts.
sql/sql_insert.cc:
A multi-row INSERT DELAYED cannot be recorded to a statement-based
binlog in a way that describes the insertions actually done;
in that case we fallback to a non-delayed INSERT.
mysql-test/r/rpl_insert_delayed.result:
result. Master and slave match.
mysql-test/t/rpl_insert_delayed.test:
Test for BUG#26116 (see if one error at first row on master makes the
slave's data incorrect, see if one error at second row on master
makes slave stop).
2007-02-15 15:39:03 +01:00
|
|
|
stop slave;
|
|
|
|
|
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
|
|
|
|
reset master;
|
|
|
|
|
reset slave;
|
|
|
|
|
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
|
|
|
|
start slave;
|
|
|
|
|
CREATE TABLE t1 (id INT primary key auto_increment, name VARCHAR(64));
|
|
|
|
|
truncate table t1;
|
|
|
|
|
insert delayed into t1 values(10, "my name");
|
|
|
|
|
insert delayed into t1 values(10, "is Bond"), (20, "James Bond");
|
|
|
|
|
ERROR 23000: Duplicate entry '10' for key 1
|
|
|
|
|
flush table t1;
|
|
|
|
|
select * from t1;
|
|
|
|
|
id name
|
|
|
|
|
10 my name
|
|
|
|
|
select * from t1;
|
|
|
|
|
id name
|
|
|
|
|
10 my name
|
|
|
|
|
delete from t1 where id!=10;
|
|
|
|
|
insert delayed into t1 values(20, "is Bond"), (10, "James Bond");
|
|
|
|
|
ERROR 23000: Duplicate entry '10' for key 1
|
|
|
|
|
flush table t1;
|
|
|
|
|
select * from t1;
|
|
|
|
|
id name
|
|
|
|
|
10 my name
|
|
|
|
|
20 is Bond
|
|
|
|
|
select * from t1;
|
|
|
|
|
id name
|
|
|
|
|
10 my name
|
|
|
|
|
20 is Bond
|
|
|
|
|
drop table t1;
|
2007-07-26 11:31:10 +03:00
|
|
|
CREATE TABLE t1(a int, UNIQUE(a));
|
|
|
|
|
INSERT DELAYED IGNORE INTO t1 VALUES(1);
|
|
|
|
|
INSERT DELAYED IGNORE INTO t1 VALUES(1);
|
|
|
|
|
show binlog events limit 11,100;
|
|
|
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
|
|
|
x x x x x use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
|
|
|
|
|
x x x x x use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
|
|
|
|
|
select * from t1;
|
|
|
|
|
a
|
|
|
|
|
1
|
|
|
|
|
On slave
|
|
|
|
|
show binlog events limit 12,100;
|
|
|
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
|
|
|
x x x x x use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
|
|
|
|
|
x x x x x use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
|
|
|
|
|
select * from t1;
|
|
|
|
|
a
|
|
|
|
|
1
|
|
|
|
|
drop table t1;
|
|
|
|
|
End of 5.0 tests
|