grant2.result:

  Post merge fix.


mysql-test/r/grant2.result:
  Post merge fix.

mysql-test/r/grant2.result

@@ -380,24 +380,6 @@ drop function f2;
 drop table t2;
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM `a@`@localhost;
 drop user `a@`@localhost;
-grant all on `mysqltest\_%`.* to mysqltest_1@localhost with grant option;
-grant usage on *.* to mysqltest_2@localhost;
-create database mysqltest_1;
-use mysqltest_1;
-create table t1 (f1 int);
-grant create on `mysqltest\_1`.* to mysqltest_2@localhost;
-grant select on mysqltest_1.t1 to mysqltest_2@localhost;
-create database mysqltest_3;
-ERROR 42000: Access denied for user 'mysqltest_2'@'localhost' to database 'mysqltest_3'
-use mysqltest_1;
-create table t2(f1 int);
-select * from t1;
-f1
-drop database mysqltest_1;
-revoke all privileges, grant option from mysqltest_1@localhost;
-revoke all privileges, grant option from mysqltest_2@localhost;
-drop user mysqltest_1@localhost;
-drop user mysqltest_2@localhost;
 SET GLOBAL log_bin_trust_function_creators = 0;
 drop database if exists mysqltest_1;
 drop database if exists mysqltest_2;
@@ -422,4 +404,22 @@ use test;
 drop database mysqltest_1;
 drop database mysqltest_2;
 drop user mysqltest_u1@localhost;
+grant all on `mysqltest\_%`.* to mysqltest_1@localhost with grant option;
+grant usage on *.* to mysqltest_2@localhost;
+create database mysqltest_1;
+use mysqltest_1;
+create table t1 (f1 int);
+grant create on `mysqltest\_1`.* to mysqltest_2@localhost;
+grant select on mysqltest_1.t1 to mysqltest_2@localhost;
+create database mysqltest_3;
+ERROR 42000: Access denied for user 'mysqltest_2'@'localhost' to database 'mysqltest_3'
+use mysqltest_1;
+create table t2(f1 int);
+select * from t1;
+f1
+drop database mysqltest_1;
+revoke all privileges, grant option from mysqltest_1@localhost;
+revoke all privileges, grant option from mysqltest_2@localhost;
+drop user mysqltest_1@localhost;
+drop user mysqltest_2@localhost;
 End of 5.0 tests