1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix sp_notembedded.test.

Browse Source
This commit is contained in:
Alexander Nozdrin 2012-10-29 12:47:01 +04:00
parent 507ffd4afc
commit 91d6f513f3
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/sp_notembedded.result
View File

@ -248,7 +248,6 @@ CREATE PROCEDURE p1(i INT) BEGIN END;
DROP PROCEDURE p1; DROP PROCEDURE p1;
DELETE FROM mysql.user WHERE User='mysqltest_1'; DELETE FROM mysql.user WHERE User='mysqltest_1';
FLUSH PRIVILEGES; FLUSH PRIVILEGES;
set @@global.concurrent_insert= @old_concurrent_insert;
# #
# Bug#44521 Prepared Statement: CALL p() - crashes: `! thd->main_da.is_sent' failed et.al. # Bug#44521 Prepared Statement: CALL p() - crashes: `! thd->main_da.is_sent' failed et.al.
# #
@ -302,3 +301,4 @@ DROP EVENT teste_bug11763507;
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# -- End of 5.1 tests # -- End of 5.1 tests
# ------------------------------------------------------------------ # ------------------------------------------------------------------
set @@global.concurrent_insert= @old_concurrent_insert;

20
mysql-test/t/sp_notembedded.test
View File

@ -371,16 +371,6 @@ DELETE FROM mysql.user WHERE User='mysqltest_1';
FLUSH PRIVILEGES; 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 #
--echo # Bug#44521 Prepared Statement: CALL p() - crashes: `! thd->main_da.is_sent' failed et.al. --echo # Bug#44521 Prepared Statement: CALL p() - crashes: `! thd->main_da.is_sent' failed et.al.
--echo # --echo #
@ -476,3 +466,13 @@ DROP EVENT teste_bug11763507;
--echo # ------------------------------------------------------------------ --echo # ------------------------------------------------------------------
--echo # -- End of 5.1 tests --echo # -- End of 5.1 tests
--echo # ------------------------------------------------------------------ --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