Merge mysql.com:/space/my/mysql-5.0.9-clone

into mysql.com:/space/my/mysql-5.0

mysql-test/r/sp-security.result

 use test;
 grant usage on *.* to user1@localhost;
 flush privileges;
+drop table if exists t1;
 drop database if exists db1_secret;
 create database db1_secret;
 create procedure db1_secret.dummy() begin end;

mysql-test/t/sp-security.test

@@ -15,6 +15,7 @@ grant usage on *.* to user1@localhost;
 flush privileges;
 
 --disable_warnings
+drop table if exists t1;
 drop database if exists db1_secret;
 --enable_warnings
 # Create our secret database