bzr commit into mysql-5.1 branch (aelkin:2705) Bug#17284, Bug#34647

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/FIXES/5.1-bt-bug34647-rpl_temporary_1more_dump_threads/

 2705 Andrei Elkin	2008-07-18
      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.
modified:
  mysql-test/suite/rpl/r/rpl_temporary.result
  mysql-test/suite/rpl/t/rpl_temporary.test

per-file messages:
  mysql-test/suite/rpl/r/rpl_temporary.result
    results changed
  mysql-test/suite/rpl/t/rpl_temporary.test
    refining the bug#17284 test to avoid counting dump threads in favor to reconnect
    explicitly with preserving the orig logics.
=== modified file 'mysql-test/suite/rpl/r/rpl_temporary.result'
--- a/mysql-test/suite/rpl/r/rpl_temporary.result	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/r/rpl_temporary.result	2008-07-18 08:20:55 +0000
@@ -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;

=== modified file 'mysql-test/suite/rpl/t/rpl_temporary.test'
--- a/mysql-test/suite/rpl/t/rpl_temporary.test	2008-03-12 12:07:35 +0000
+++ b/mysql-test/suite/rpl/t/rpl_temporary.test	2008-07-18 08:20:55 +0000
@@ -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 */;