diff options
| author | unknown <holyfoot@mysql.com> | 2006-05-03 16:47:05 +0500 |
|---|---|---|
| committer | unknown <holyfoot@mysql.com> | 2006-05-03 16:47:05 +0500 |
| commit | 2304a588e1767c0128fd0d30c72b9061232d0aed (patch) | |
| tree | 57c7ab9929b00c248b95bfa2fb3e545663c39f8b /mysql-test | |
| parent | 83c8e2c910a9f07c473aaa2d254f0571d574aa89 (diff) | |
| parent | f4e858110c8a5fd57bb98523be1c03899bbac68f (diff) | |
| download | mariadb-git-2304a588e1767c0128fd0d30c72b9061232d0aed.tar.gz | |
merging
mysql-test/t/sp_notembedded.test:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/sp_notembedded.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/sp_notembedded.test | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/sp_notembedded.result b/mysql-test/r/sp_notembedded.result index e39ddd1d79d..c8cafe5ace1 100644 --- a/mysql-test/r/sp_notembedded.result +++ b/mysql-test/r/sp_notembedded.result @@ -1,3 +1,4 @@ +drop table if exists t1,t3; drop procedure if exists bug4902| create procedure bug4902() begin diff --git a/mysql-test/t/sp_notembedded.test b/mysql-test/t/sp_notembedded.test index 4eb429156b2..893884b302f 100644 --- a/mysql-test/t/sp_notembedded.test +++ b/mysql-test/t/sp_notembedded.test @@ -1,6 +1,10 @@ # Can't test with embedded server -- source include/not_embedded.inc +--sleep 2 +--disable_warnings +drop table if exists t1,t3; +--enable_warnings delimiter |; # @@ -261,3 +265,4 @@ drop view v1| drop table t3| delimiter ;| +drop table t3; |