diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 19:24:20 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 19:24:20 +0200 |
commit | 13dca0125a14726d2c3274f679aa002d0f7577a0 (patch) | |
tree | fcfb6d72dcfb5af60bd8158b1641318295b9b609 /mysql-test/r/sp.result | |
parent | d1fdb17bfb774e4e29c8a337b497128fd01a3473 (diff) | |
download | mariadb-git-13dca0125a14726d2c3274f679aa002d0f7577a0.tar.gz |
more post-merge fixes:
* update results
* don't force HA_CREATE_DELAY_KEY_WRITE on all temp tables,
(bad for CREATE ... LIKE) instead imply it in myisam/aria
* restore HA_ERR_TABLE_DEF_CHANGED in archive
* increase the default number of rwlock classes in P_S to fit all our rwlocks
Diffstat (limited to 'mysql-test/r/sp.result')
-rw-r--r-- | mysql-test/r/sp.result | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index 75a6c6278be..912ffe07d10 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -7788,8 +7788,6 @@ message You should see this message and the warning that generated this Level Code Message Warning 1329 No data - zero rows fetched, selected, or processed -Warnings: -Warning 1329 No data - zero rows fetched, selected, or processed drop procedure p1; drop procedure p0; drop table t1; |