diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-01-15 19:07:46 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-15 19:07:46 +0100 |
commit | aca8e7ed6b176f28e8a34ebddc989574d93f305c (patch) | |
tree | c0d20e5b3e9518f48d789e2220eea46d9010966d /mysql-test/r/sp_notembedded.result | |
parent | 750b9147fced7202b541be946e044eb739b20a03 (diff) | |
parent | 4f67a14700c0266c58b05be0dbd8fc10f88464a6 (diff) | |
download | mariadb-git-aca8e7ed6b176f28e8a34ebddc989574d93f305c.tar.gz |
5.3 merge
Diffstat (limited to 'mysql-test/r/sp_notembedded.result')
-rw-r--r-- | mysql-test/r/sp_notembedded.result | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/sp_notembedded.result b/mysql-test/r/sp_notembedded.result index 0b4b1726e22..60cd8b3ce11 100644 --- a/mysql-test/r/sp_notembedded.result +++ b/mysql-test/r/sp_notembedded.result @@ -280,3 +280,7 @@ 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. +# ------------------------------------------------------------------ +# -- End of 5.1 tests +# ------------------------------------------------------------------ +set @@global.concurrent_insert= @old_concurrent_insert; |