diff options
| author | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2012-10-29 13:06:43 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2012-10-29 13:06:43 +0400 |
| commit | 122d598a000f7694919fe8cb4218a9c909769f5f (patch) | |
| tree | ad382a889a667ca37425b155de9dc8ae2562d39a /mysql-test/r/sp_notembedded.result | |
| parent | 4baab59e93c7d02f33a711e1ee54ea324f6bd988 (diff) | |
| parent | 6b7419d3d089694b6cfe47e7e7f23e9bc436c696 (diff) | |
| download | mariadb-git-122d598a000f7694919fe8cb4218a9c909769f5f.tar.gz | |
Merge from 5.1.
Diffstat (limited to 'mysql-test/r/sp_notembedded.result')
| -rw-r--r-- | mysql-test/r/sp_notembedded.result | 2 |
1 files changed, 1 insertions, 1 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; |