diff options
author | unknown <msvensson@neptunus.(none)> | 2006-11-07 10:44:44 +0100 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2006-11-07 10:44:44 +0100 |
commit | 4250321d43905e286d6f0287da92c0a5670cc219 (patch) | |
tree | f1273ac58ffb920c1d54ff69c05f996bbb5995cc /mysql-test/t/sp_notembedded.test | |
parent | 31afbcff2a39b588294f80a13de19e05c5c472ef (diff) | |
parent | 024a1781a6310383c1e352d483e7a701d564d051 (diff) | |
download | mariadb-git-4250321d43905e286d6f0287da92c0a5670cc219.tar.gz |
Merge neptunus.(none):/home/msvensson/mysql/my50-rt-im_d_fix
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
mysql-test/t/im_daemon_life_cycle.imtest:
Auto merged
Diffstat (limited to 'mysql-test/t/sp_notembedded.test')
-rw-r--r-- | mysql-test/t/sp_notembedded.test | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/t/sp_notembedded.test b/mysql-test/t/sp_notembedded.test index b087f699f86..4e18e69d3d2 100644 --- a/mysql-test/t/sp_notembedded.test +++ b/mysql-test/t/sp_notembedded.test @@ -19,11 +19,11 @@ begin show grants for 'root'@'localhost'; end| --disable_parsing -show binlog events; -show storage engines; -show master status; -show slave hosts; -show slave status; +show binlog events| +show storage engines| +show master status| +show slave hosts| +show slave status| --enable_parsing call bug4902()| @@ -108,7 +108,7 @@ flush status| flush query cache| delete from t1| drop procedure bug3583| -drop table t1; +drop table t1| # # BUG#6807: Stored procedure crash if CREATE PROCEDURE ... KILL QUERY |