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

Merge from 5.1.

Browse Source
This commit is contained in:
Alexander Nozdrin 2012-10-29 13:06:43 +04:00
commit eaf3c8f79b
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -309,7 +309,6 @@ SELECT `my.db`.f1(2);
# Switching to default connection. # Switching to default connection.
DROP DATABASE `my.db`; DROP DATABASE `my.db`;
USE test; USE test;
set @@global.concurrent_insert= @old_concurrent_insert;
# #
# Bug#11763507 - 56224: FUNCTION NAME IS CASE-SENSITIVE # 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 teste_bug11763507 SYSTEM # latin1 latin1_swedish_ci latin1_swedish_ci
DROP EVENT teste_bug11763507; DROP EVENT teste_bug11763507;
#END OF BUG#11763507 test. #END OF BUG#11763507 test.
set @@global.concurrent_insert= @old_concurrent_insert;

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

@ -475,14 +475,6 @@ disconnect addcon;
DROP DATABASE `my.db`; DROP DATABASE `my.db`;
USE test; 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 #
--echo # Bug#11763507 - 56224: FUNCTION NAME IS CASE-SENSITIVE --echo # Bug#11763507 - 56224: FUNCTION NAME IS CASE-SENSITIVE
@ -507,3 +499,13 @@ SHOW CREATE EVENT TESTE_bug11763507;
DROP EVENT teste_bug11763507; DROP EVENT teste_bug11763507;
--echo #END OF BUG#11763507 test. --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