mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
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.
This commit is contained in:
parent
9cd4c070c1
commit
d3dd075227
2 changed files with 12 additions and 4 deletions
|
@ -109,8 +109,6 @@ create temporary table t102 (id int);
|
||||||
set @session.pseudo_thread_id=200;
|
set @session.pseudo_thread_id=200;
|
||||||
create temporary table t201 (id int);
|
create temporary table t201 (id int);
|
||||||
create temporary table `#not_user_table_prefixed_with_hash_sign_no_harm` (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);
|
create table t1(f int);
|
||||||
insert into t1 values (1);
|
insert into t1 values (1);
|
||||||
select * from t1 /* must be 1 */;
|
select * from t1 /* must be 1 */;
|
||||||
|
|
|
@ -169,8 +169,18 @@ create temporary table t102 (id int);
|
||||||
set @session.pseudo_thread_id=200;
|
set @session.pseudo_thread_id=200;
|
||||||
create temporary table t201 (id int);
|
create temporary table t201 (id int);
|
||||||
create temporary table `#not_user_table_prefixed_with_hash_sign_no_harm` (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
|
#now do something to show that slave is ok after DROP temp tables
|
||||||
connection master;
|
connection master;
|
||||||
|
|
Loading…
Reference in a new issue