From 58cb8cbeb4313182bd985a36ea32e153841b5208 Mon Sep 17 00:00:00 2001
From: Andrei Elkin <aelkin@mysql.com>
Date: Fri, 18 Jul 2008 11:20:55 +0300
Subject: [PATCH] Bug #34647 rpl_temporary discovers more than one dump thread
 and fails to select

Many dump threads can exist due to a way the new version of mtr governs suites.

For this immediate problem the test is refined not to use I_S but rather to reconnect
explicitly with preserving logics of a an old target bug fixes verification.
---
 mysql-test/suite/rpl/r/rpl_temporary.result | 4 ++--
 mysql-test/suite/rpl/t/rpl_temporary.test   | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/mysql-test/suite/rpl/r/rpl_temporary.result b/mysql-test/suite/rpl/r/rpl_temporary.result
index 7e7d0cebe1d..03d2ca660dc 100644
--- a/mysql-test/suite/rpl/r/rpl_temporary.result
+++ b/mysql-test/suite/rpl/r/rpl_temporary.result
@@ -76,9 +76,9 @@ drop table t1,t2;
 create temporary table t3 (f int);
 create temporary table t4 (f int);
 create table t5 (f int);
-select id from information_schema.processlist where command='Binlog Dump' into @id;
-kill @id;
+stop slave;
 insert into t5 select * from t4;
+start slave;
 select * from t5 /* must be 1 after reconnection */;
 f
 drop temporary table t4;
diff --git a/mysql-test/suite/rpl/t/rpl_temporary.test b/mysql-test/suite/rpl/t/rpl_temporary.test
index 44f901bdae7..51b38ed4837 100644
--- a/mysql-test/suite/rpl/t/rpl_temporary.test
+++ b/mysql-test/suite/rpl/t/rpl_temporary.test
@@ -138,20 +138,21 @@ sync_slave_with_master;
 
 #
 # Bug#17284 erroneous temp table cleanup on slave
+# The test targets at verifying that reconnected slave
+# retained the former session's temporary tables
 #
-
 connection master;
 create temporary table t4 (f int);
 create table t5 (f int);
 sync_slave_with_master;
+# connection slave
+stop slave;  # to prepare for reconnecting w/o waiting for timeout
 connection master;
-# find dumper's $id
-select id from information_schema.processlist where command='Binlog Dump' into @id;
-kill @id; # to stimulate reconnection by slave w/o timeout
 insert into t5 select * from t4;
 save_master_pos;
 
 connection slave;
+start slave;
 sync_with_master;
 select * from t5 /* must be 1 after reconnection */;