diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/sp_notembedded.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/sp_notembedded.test | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/mysql-test/r/sp_notembedded.result b/mysql-test/r/sp_notembedded.result index 7d3f90e157a..6c50a74d666 100644 --- a/mysql-test/r/sp_notembedded.result +++ b/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 # @@ -330,3 +329,4 @@ Event sql_mode time_zone Create Event character_set_client collation_connection teste_bug11763507 SYSTEM # latin1 latin1_swedish_ci latin1_swedish_ci DROP EVENT teste_bug11763507; #END OF BUG#11763507 test. +set @@global.concurrent_insert= @old_concurrent_insert; diff --git a/mysql-test/t/sp_notembedded.test b/mysql-test/t/sp_notembedded.test index 1d53964a91d..dd1f426c01a 100644 --- a/mysql-test/t/sp_notembedded.test +++ b/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 @@ -507,3 +499,13 @@ SHOW CREATE EVENT TESTE_bug11763507; DROP EVENT teste_bug11763507; --echo #END OF BUG#11763507 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 |