Merge bk@192.168.21.1:mysql-5.0

into mysql.com:/home/hf/work/mysql-5.0.17756

mysql-test/r/sp_notembedded.result

+drop table if exists t1,t3;
 drop procedure if exists bug4902|
 create procedure bug4902()
 begin
@@ -204,3 +205,4 @@ drop procedure bug10100pv|
 drop procedure bug10100pd|
 drop procedure bug10100pc|
 drop view v1|
+drop table t3;

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 |;
 
 #
@@ -260,3 +264,4 @@ drop procedure bug10100pc|
 drop view v1|
 
 delimiter ;|
+drop table t3;