merging

mysql-test/t/sp_notembedded.test: Auto merged

merging
mysql-test/t/sp_notembedded.test: Auto merged
2304a588 · unknown · 83c8e2c9 · f4e85811 · 2304a588 · 2304a588
Commit 2304a588 authored May 03, 2006 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

mysql-test/r/sp_notembedded.result mysql-test/r/sp_notembedded.result +1 -0

mysql-test/t/sp_notembedded.test mysql-test/t/sp_notembedded.test +5 -0

No files found.
--- a/mysql-test/r/sp_notembedded.result
+++ b/mysql-test/r/sp_notembedded.result
+drop table if exists t1,t3;
 drop procedure if exists bug4902|
 create procedure bug4902()
 begin

--- a/mysql-test/t/sp_notembedded.test
+++ b/mysql-test/t/sp_notembedded.test
 # 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;