Adding upstream version 1:10.11.6.upstream/1%10.11.6

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 67 insertions, 0 deletions

diff --git a/mysql-test/suite/rpl/r/rpl_insert_delayed.result b/mysql-test/suite/rpl/r/rpl_insert_delayed.result
new file mode 100644
index 00000000..bbc61ed0
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_insert_delayed.result
@@ -0,0 +1,67 @@
+include/master-slave.inc
+[connection master]
+connection master;
+CREATE SCHEMA IF NOT EXISTS mysqlslap;
+USE mysqlslap;
+CREATE TABLE t1 (id INT primary key auto_increment, name VARCHAR(64)) ENGINE=MyISAM;
+FLUSH TABLE t1;
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+5000
+connection slave;
+use mysqlslap;
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+5000
+connection master;
+truncate table t1;
+insert delayed into t1 values(10, "my name");
+flush table t1;
+insert delayed into t1 values(10, "is Bond"), (20, "James Bond");
+flush table t1;
+select * from t1;
+id	name
+10	my name
+20	James Bond
+connection slave;
+select * from t1;
+id	name
+10	my name
+20	James Bond
+connection master;
+delete from t1 where id!=10;
+insert delayed into t1 values(20, "is Bond"), (10, "James Bond");
+flush table t1;
+select * from t1;
+id	name
+10	my name
+20	is Bond
+connection slave;
+select * from t1;
+id	name
+10	my name
+20	is Bond
+connection master;
+USE test;
+DROP SCHEMA mysqlslap;
+connection slave;
+use test;
+connection master;
+CREATE TABLE t1(a int, UNIQUE(a));
+INSERT DELAYED IGNORE INTO t1 VALUES(1);
+INSERT DELAYED IGNORE INTO t1 VALUES(1);
+flush table t1;
+select * from t1;
+a
+1
+connection slave;
+On slave
+select * from t1;
+a
+1
+connection master;
+drop table t1;
+connection slave;
+connection master;
+End of 5.0 tests
+include/rpl_end.inc