Create 'main' test directory and move 't' and 'r' there

1 files changed, 0 insertions, 116 deletions

diff --git a/mysql-test/r/sp-threads.result b/mysql-test/r/sp-threads.result
deleted file mode 100644
index 886cbd812f2..00000000000
--- a/mysql-test/r/sp-threads.result
+++ /dev/null
@@ -1,116 +0,0 @@
-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);
-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;
-drop table if exists t1, t2;
-create table t1 (id1 int, val int);
-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;
-SELECT state,info FROM information_schema.processlist WHERE id=con1root_id;
-state	info
-Waiting for table metadata lock	update t1, t2 set val= 1 where id1=id2
-unlock tables;
-connection con1root;
-drop procedure bug9486;
-drop table t1, t2;
-drop procedure if exists bug11158;
-create procedure bug11158() delete t1 from t1, t2 where t1.id = t2.id;
-create table t1 (id int, j int);
-insert into t1 values (1, 1), (2, 2);
-create table t2 (id int);
-insert into t2 values (1);
-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;
-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()
-begin
-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
-1
-drop procedure p1;
-drop procedure p2;
-drop table t1;
-connection default;
-disconnect con1root;
-disconnect con2root;
-disconnect con3root;