bk commit into 5.0 tree (msvensson:1.2125) BUG#19709

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2125 06/05/11 13:44:14 msvensson@neptunus.(none) +2 -0
  Bug#19709 rpl_tmporary fails on powermacg5
   - Don't kill the active connection to the server, instead read 
     the connection id, switch connection and kill the first one from there.

  mysql-test/t/rpl_temporary.test
    1.19 06/05/11 13:44:10 msvensson@neptunus.(none) +8 -2
    Don't kill our own connection to the server as the result code differs depending 
    on platform.

  mysql-test/r/rpl_temporary.result
    1.24 06/05/11 13:44:10 msvensson@neptunus.(none) +0 -2
    Update test result

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/my50-bug19709

--- 1.23/mysql-test/r/rpl_temporary.result	2006-04-23 19:06:24 +02:00
+++ 1.24/mysql-test/r/rpl_temporary.result	2006-05-11 13:44:10 +02:00
@@ -109,8 +109,6 @@
 set @session.pseudo_thread_id=200;
 create temporary table t201 (id int);
 create temporary table `#not_user_table_prefixed_with_hash_sign_no_harm` (id int);
-set @con1_id=connection_id();
-kill @con1_id;
 create table t1(f int);
 insert into t1 values (1);
 select * from t1 /* must be 1 */;

--- 1.18/mysql-test/t/rpl_temporary.test	2006-04-23 19:06:24 +02:00
+++ 1.19/mysql-test/t/rpl_temporary.test	2006-05-11 13:44:10 +02:00
@@ -169,8 +169,14 @@
 set @session.pseudo_thread_id=200;
 create temporary table t201 (id int);
 create temporary table `#not_user_table_prefixed_with_hash_sign_no_harm` (id int);
-set @con1_id=connection_id();
-kill @con1_id;
+
+# Select the id to kill into a variable of mysqltest
+let $con1_id= `select connection_id()`;
+# Switch connection to avoid killing our own connection
+connection master;
+--disable_query_log
+eval kill $con1_id;
+--enable_query_log
 
 #now do something to show that slave is ok after DROP temp tables
 connection master;