5 files changed, 25 insertions, 17 deletions
diff --git a/mysql-test/r/keywords.result b/mysql-test/r/keywords.result
index e4c83b21138..5f338ad6a62 100644
--- a/mysql-test/r/keywords.result
+++ b/mysql-test/r/keywords.result
@@ -16,19 +16,6 @@ select events.binlog from events;
 binlog
 1
 drop table events;
-create table t1 (connection int, b int);
-create procedure p1()
-begin
-declare connection int;
-select max(t1.connection) into connection from t1;
-select concat("max=",connection) 'p1';
-end|
-insert into t1 (connection) values (1);
-call p1();
-p1
-max=1
-drop procedure p1;
-drop table t1;
 create procedure p1()
 begin
 declare n int default 2;
@@ -45,3 +32,16 @@ end while contributors;
 end|
 drop procedure p1;
 drop procedure p2;
+create table t1 (connection int, b int);
+create procedure p1()
+begin
+declare connection int;
+select max(t1.connection) into connection from t1;
+select concat("max=",connection) 'p1';
+end|
+insert into t1 (connection) values (1);
+call p1();
+p1
+max=1
+drop procedure p1;
+drop table t1;
diff --git a/mysql-test/r/ndb_lock.result b/mysql-test/r/ndb_lock.result
index 44eb5c8b3f3..9057731c3f4 100644
--- a/mysql-test/r/ndb_lock.result
+++ b/mysql-test/r/ndb_lock.result
@@ -121,7 +121,7 @@ select * from t1 where x = 1 for update;
 x	y	z
 1	one	1
 select * from t1 where x = 2 for update;
-ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+Got one of the listed errors
 rollback;
 commit;
 begin;
diff --git a/mysql-test/r/no-threads.result b/mysql-test/r/no-threads.result
new file mode 100644
index 00000000000..50e52138be8
--- /dev/null
+++ b/mysql-test/r/no-threads.result
@@ -0,0 +1,6 @@
+select 1+1;
+1+1
+2
+select 1+2;
+1+2
+3
diff --git a/mysql-test/r/one_thread_per_connection.require b/mysql-test/r/one_thread_per_connection.require
new file mode 100644
index 00000000000..b2efbca6441
--- /dev/null
+++ b/mysql-test/r/one_thread_per_connection.require
@@ -0,0 +1,2 @@
+@@thread_handling
+one-thread-per-connection
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index a99fdb16868..7b19492faec 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -2157,11 +2157,11 @@ drop view v1;
 drop table t1;
 create procedure proc_1() install plugin my_plug soname 'some_plugin.so';
 call proc_1();
-ERROR HY000: Can't open shared library
+Got one of the listed errors
 call proc_1();
-ERROR HY000: Can't open shared library
+Got one of the listed errors
 call proc_1();
-ERROR HY000: Can't open shared library
+Got one of the listed errors
 drop procedure proc_1;
 create function func_1() returns int begin install plugin my_plug soname '/tmp/plugin'; return 1; end|
 ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.