1 files changed, 28 insertions, 0 deletions
diff --git a/mysql-test/r/sp-threads.result b/mysql-test/r/sp-threads.result
index 4ce61c44762..eb1c0beff65 100644
--- a/mysql-test/r/sp-threads.result
+++ b/mysql-test/r/sp-threads.result
@@ -1,3 +1,7 @@
+connect  con1root,localhost,root,,;
+connect  con2root,localhost,root,,;
+connect  con3root,localhost,root,,;
+connection con1root;
 use test;
 drop table if exists t1;
 create table t1 (s1 int, s2 int, s3 int);
@@ -5,22 +9,26 @@ create procedure bug4934()
 begin
 insert into t1 values (1,0,1);
 end//
+connection con2root;
 use test;
 call bug4934();
 select * from t1;
 s1	s2	s3
 1	0	1
+connection con1root;
 drop table t1;
 create table t1 (s1 int, s2 int, s3 int);
 drop procedure bug4934;
 create procedure bug4934()
 begin
 end//
+connection con2root;
 select * from t1;
 s1	s2	s3
 call bug4934();
 select * from t1;
 s1	s2	s3
+connection con1root;
 drop table t1;
 drop procedure bug4934;
 drop procedure if exists bug9486;
@@ -30,8 +38,11 @@ create table t2 (id2 int);
 create procedure bug9486()
 update t1, t2 set val= 1 where id1=id2;
 call bug9486();
+connection con2root;
 lock tables t2 write;
+connection con1root;
 call bug9486();
+connection con2root;
 show processlist;
 Id	User	Host	db	Command	Time	State	Info	Progress
 #	root	localhost	test	Sleep	#		NULL	0.000
@@ -39,6 +50,7 @@ Id	User	Host	db	Command	Time	State	Info	Progress
 #	root	localhost	test	Query	#	init	show processlist	0.000
 #	root	localhost	test	Sleep	#		NULL	0.000
 unlock tables;
+connection con1root;
 drop procedure bug9486;
 drop table t1, t2;
 drop procedure if exists bug11158;
@@ -51,9 +63,13 @@ call bug11158();
 select * from t1;
 id	j
 2	2
+connection con2root;
 lock tables t2 read;
+connection con1root;
 call bug11158();
+connection con2root;
 unlock tables;
+connection con1root;
 drop procedure bug11158;
 drop table t1, t2;
 drop function if exists bug11554;
@@ -61,12 +77,15 @@ drop view if exists v1;
 create table t1 (i int);
 create function bug11554 () returns int return 1;
 create view v1 as select bug11554() as f;
+connection con2root;
 insert into t1 (select f from v1);
+connection con1root;
 drop function bug11554;
 drop table t1;
 drop view v1;
 drop procedure if exists p1;
 drop procedure if exists p2;
+connection con1root;
 create table t1 (s1 int)|
 create procedure p1() select * from t1|
 create procedure p2()
@@ -75,13 +94,18 @@ insert into t1 values (1);
 call p1();
 select * from t1;
 end|
+connection con2root;
 use test;
 lock table t1 write;
+connection con1root;
 call p2();
+connection con3root;
 use test;
 drop procedure p1;
 create procedure p1() select * from t1;
+connection con2root;
 unlock tables;
+connection con1root;
 s1
 1
 s1
@@ -89,3 +113,7 @@ s1
 drop procedure p1;
 drop procedure p2;
 drop table t1;
+connection default;
+disconnect con1root;
+disconnect con2root;
+disconnect con3root;