8 files changed, 39 insertions, 4 deletions
diff --git a/mysql-test/r/3.23/rpl000013.result b/mysql-test/r/3.23/rpl000013.result
new file mode 100644
index 00000000000..22fd6be3003
--- /dev/null
+++ b/mysql-test/r/3.23/rpl000013.result
@@ -0,0 +1,7 @@
+n	
+1	
+2	
+3	
+4	
+5	
+6	
diff --git a/mysql-test/r/3.23/rpl000013.status.result b/mysql-test/r/3.23/rpl000013.status.result
new file mode 100644
index 00000000000..fbbae06c3f9
--- /dev/null
+++ b/mysql-test/r/3.23/rpl000013.status.result
@@ -0,0 +1,2 @@
+Variable_name	Value	
+Slave_open_temp_tables	0	
diff --git a/mysql-test/t/3.23/rpl000001.test b/mysql-test/t/3.23/rpl000001.test
index f49a9d2b146..bd094cd6391 100644
--- a/mysql-test/t/3.23/rpl000001.test
+++ b/mysql-test/t/3.23/rpl000001.test
@@ -8,7 +8,7 @@ drop table if exists foo;
 create table foo(n int);
 insert into foo values(1),(2);
 connection slave;
-sleep 3;
+sleep 2;
 use test;
 @r/3.23/rpl000001.a.result select * from foo;
 @r/3.23/rpl000001.b.result select sum(length(word)) from words;
diff --git a/mysql-test/t/3.23/rpl000002.test b/mysql-test/t/3.23/rpl000002.test
index b7df0e3e7ef..b411a0f42ce 100644
--- a/mysql-test/t/3.23/rpl000002.test
+++ b/mysql-test/t/3.23/rpl000002.test
@@ -7,5 +7,5 @@ set insert_id = 2000;
 insert into x values (NULL),(NULL),(NULL);
 connection slave;
 use test;
-sleep 1;
+sleep 0.5;
 @r/3.23/rpl000002.result select * from x;
diff --git a/mysql-test/t/3.23/rpl000003.test b/mysql-test/t/3.23/rpl000003.test
index 5f64a743bc1..8aa6eb09c4d 100644
--- a/mysql-test/t/3.23/rpl000003.test
+++ b/mysql-test/t/3.23/rpl000003.test
@@ -5,5 +5,5 @@ create table x(n int primary key);
 !insert into x values (1),(2),(2);
 insert into x values (3);
 connection slave;
-sleep 1;
+sleep 0.5;
 @r/3.23/rpl000003.result select * from x;                                     
diff --git a/mysql-test/t/3.23/rpl000005.test b/mysql-test/t/3.23/rpl000005.test
index 403c0efd9bb..dac48849e25 100644
--- a/mysql-test/t/3.23/rpl000005.test
+++ b/mysql-test/t/3.23/rpl000005.test
@@ -8,5 +8,5 @@ INSERT into test SET name='Caleb', age=1;
 ALTER TABLE test ADD id int(8) ZEROFILL AUTO_INCREMENT PRIMARY KEY;
 @r/3.23/rpl000005.result select * from test;
 connection slave;
-sleep 1;
+sleep 0.5;
 @r/3.23/rpl000005.result select * from test;
diff --git a/mysql-test/t/3.23/rpl000013-slave.opt b/mysql-test/t/3.23/rpl000013-slave.opt
new file mode 100644
index 00000000000..2662c695b41
--- /dev/null
+++ b/mysql-test/t/3.23/rpl000013-slave.opt
@@ -0,0 +1 @@
+--abort-slave-event-count=1
diff --git a/mysql-test/t/3.23/rpl000013.test b/mysql-test/t/3.23/rpl000013.test
new file mode 100644
index 00000000000..f54482f41e9
--- /dev/null
+++ b/mysql-test/t/3.23/rpl000013.test
@@ -0,0 +1,25 @@
+source t/include/master-slave.inc;
+connection master;
+drop table if exists x;
+create table x(n int);
+create temporary table t(n int);
+insert into t values(1),(2),(3);
+insert into x select * from t;
+connection master1;
+create temporary table t (n int);
+insert into t values (4),(5);
+insert into x select * from t;
+disconnect master;
+connection master1;
+insert into x values(6);
+disconnect master1;
+connection slave;
+let $1=12;
+while ($1)
+{
+ !slave start;
+ sleep 0.2;
+ dec $1;
+}
+@r/3.23/rpl000013.result select * from x;
+@r/3.23/rpl000013.status.result show status like 'Slave_open_temp_tables';