diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-01-09 23:51:51 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-09 23:51:51 +0100 |
commit | 2e11ca36f28133c18b72351d176ee2fd7fcbc465 (patch) | |
tree | 5aefb03db444e9c2856c3aba50f2f28e8fa12772 /mysql-test/r/sp_notembedded.result | |
parent | eff07bf08e29afab76c7688ec063ef6881ee464f (diff) | |
parent | d07b5f1ca295d4eb6eeba0b88c93f04e9e21cb5c (diff) | |
download | mariadb-git-2e11ca36f28133c18b72351d176ee2fd7fcbc465.tar.gz |
mysql-5.1.67 merge
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 6c680644ade..9addcedee70 100644 --- a/mysql-test/r/sp_notembedded.result +++ b/mysql-test/r/sp_notembedded.result @@ -196,7 +196,6 @@ CREATE PROCEDURE p1(i INT) BEGIN END; DROP PROCEDURE p1; DELETE FROM mysql.user WHERE User='mysqltest_1'; FLUSH PRIVILEGES; -set @@global.concurrent_insert= @old_concurrent_insert; # # Bug#44521 Prepared Statement: CALL p() - crashes: `! thd->main_da.is_sent' failed et.al. # @@ -250,3 +249,4 @@ DROP EVENT teste_bug11763507; # ------------------------------------------------------------------ # -- End of 5.1 tests # ------------------------------------------------------------------ +set @@global.concurrent_insert= @old_concurrent_insert; |