Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/rpl_loaddata_m.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/read_only.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
mysql-test/t/trigger-compat.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
mysql-test/r/trigger-compat.result:
  Merge 5.0 -> 5.1

1 files changed, 2 insertions, 0 deletions

diff --git a/mysql-test/t/grant2.test b/mysql-test/t/grant2.test
index c19bb1482d6..430a3a5dd4a 100644
--- a/mysql-test/t/grant2.test
+++ b/mysql-test/t/grant2.test
@@ -286,6 +286,7 @@ drop user 'mysqltest_1b', 'mysqltest_2b', 'mysqltest_3b';
 create user 'mysqltest_2' identified by 'Mysqltest-2';
 --error 1064
 drop user 'mysqltest_2' identified by 'Mysqltest-2';
+drop user 'mysqltest_2';
 #
 # Strange user names
 create user '%@b'@'b';
@@ -325,6 +326,7 @@ insert into mysql.user set host='%', user='mysqltest_B';
 create user mysqltest_A@'%';
 rename user mysqltest_B@'%' to mysqltest_C@'%';
 drop user mysqltest_C@'%';
+drop user mysqltest_A@'%';
 disconnect user4;
 connection default;
 drop user mysqltest_3@localhost;