Merge from 5.5.

Author: Alexander Nozdrin

mysql-test/r/sp_notembedded.result

@@ -309,7 +309,6 @@ SELECT `my.db`.f1(2);
 # Switching to default connection.
 DROP DATABASE `my.db`;
 USE test;
-set @@global.concurrent_insert= @old_concurrent_insert;
 #
 # Bug#11763507 - 56224: FUNCTION NAME IS CASE-SENSITIVE
 #
@@ -367,3 +366,4 @@ RELEASE_LOCK('e1_lock')
 DROP EVENT e1;
 DROP TABLE t1, t2, t3;
 SET GLOBAL EVENT_SCHEDULER = OFF;
+set @@global.concurrent_insert= @old_concurrent_insert;

mysql-test/t/sp_notembedded.test

@@ -475,14 +475,6 @@ disconnect addcon;
 DROP DATABASE `my.db`;
 USE test;
 
-#
-# Restore global concurrent_insert value. Keep in the end of the test file.
-#
-
-set @@global.concurrent_insert= @old_concurrent_insert;
-
-# Wait till all disconnects are completed
---source include/wait_until_count_sessions.inc
 
 --echo #
 --echo # Bug#11763507 - 56224: FUNCTION NAME IS CASE-SENSITIVE
@@ -560,3 +552,13 @@ DROP EVENT e1;
 DROP TABLE t1, t2, t3;
 
 SET GLOBAL EVENT_SCHEDULER = OFF;
+
+
+#
+# Restore global concurrent_insert value. Keep in the end of the test file.
+#
+
+set @@global.concurrent_insert= @old_concurrent_insert;
+
+# Wait till all disconnects are completed
+--source include/wait_until_count_sessions.inc