diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-01-10 15:40:21 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-10 15:40:21 +0100 |
commit | 4f67a14700c0266c58b05be0dbd8fc10f88464a6 (patch) | |
tree | 568cd8f2997888d5c1035ad8e9b5e823197dcf62 /mysql-test/t/sp_notembedded.test | |
parent | b0ee31c89480519490537b89dca1e8cc65e2b73b (diff) | |
parent | bd87fed1dc0caa0720e5a60f0fca1b714c58ac75 (diff) | |
download | mariadb-git-4f67a14700c0266c58b05be0dbd8fc10f88464a6.tar.gz |
5.2->5.3 merge
Diffstat (limited to 'mysql-test/t/sp_notembedded.test')
-rw-r--r-- | mysql-test/t/sp_notembedded.test | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mysql-test/t/sp_notembedded.test b/mysql-test/t/sp_notembedded.test index 93dd04908cb..e4c3351738e 100644 --- a/mysql-test/t/sp_notembedded.test +++ b/mysql-test/t/sp_notembedded.test @@ -325,16 +325,6 @@ DELETE FROM mysql.user WHERE User='mysqltest_1'; FLUSH PRIVILEGES; -# -# 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#44521 Prepared Statement: CALL p() - crashes: `! thd->main_da.is_sent' failed et.al. --echo # @@ -430,3 +420,13 @@ DROP EVENT teste_bug11763507; --echo # ------------------------------------------------------------------ --echo # -- End of 5.1 tests --echo # ------------------------------------------------------------------ + + +# +# 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 |