Merge

2 files changed, 14 insertions, 0 deletions

diff --git a/repl-tests/test-bad-query/run.test b/repl-tests/test-bad-query/run.test
new file mode 100755
index 00000000000..a86aaf84096
--- /dev/null
+++ b/repl-tests/test-bad-query/run.test
@@ -0,0 +1,10 @@
+source ../include/master-slave.inc;
+connection master;
+drop table if exists x;
+create table x(n int primary key);
+!insert into x values (1),(2),(2);
+insert into x values (3);
+connection slave;
+sleep 3;
+@x.master select * from x;
+ 
diff --git a/repl-tests/test-bad-query/x.master b/repl-tests/test-bad-query/x.master
new file mode 100644
index 00000000000..c62967af0bb
--- /dev/null
+++ b/repl-tests/test-bad-query/x.master
@@ -0,0 +1,4 @@
+n	
+1	
+2	
+3