Merge from 5.1.
This commit is contained in:
commit
eaf3c8f79b
@ -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;
|
||||||
|
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user