Commit 42c47bcb authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/my50-bug19709 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
parents 60bb69aa acf18799

mysql-test/r/rpl_temporary.result

+0 −2
Original line number Diff line number Diff line
@@ -109,8 +109,6 @@ create temporary table t102 (id int); 
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 */;

mysql-test/t/rpl_temporary.test

+12 −2
Original line number Diff line number Diff line
@@ -169,8 +169,18 @@ create temporary table t102 (id int); 
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;



#

# Don't kill our own connection to the server as

# the result code differs depending on platform.

#

# 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;