sql/sql_acl.cc

    report correct errror in MODE_NO_AUTO_CREATE_USER
    cleanup
after merge fixes


mysql-test/r/grant2.result:
  updated after merge
mysql-test/r/grant3.result:
  updated after merge
mysql-test/r/rpl_temporary.result:
  sqlstate fixed
mysql-test/t/grant2.test:
  updated after merge
mysql-test/t/grant3.test:
  updated after merge
sql/share/errmsg.txt:
  sqlstate fixed
sql/sql_acl.cc:
  report correct errror in MODE_NO_AUTO_CREATE_USER
  cleanup

1 files changed, 2 insertions, 1 deletions

diff --git a/mysql-test/t/grant3.test b/mysql-test/t/grant3.test
index dca4ff9496e..1488f910bc8 100644
--- a/mysql-test/t/grant3.test
+++ b/mysql-test/t/grant3.test
@@ -16,12 +16,13 @@ delete from mysql.columns_priv where user like 'mysqltest\_%';
 flush privileges;
 
 create user mysqltest_1@localhost;
-grant grant option on mysql.* to mysqltest_1@localhost;
+grant create user on *.* to mysqltest_1@localhost;
 grant select on `my\_1`.* to mysqltest_1@localhost with grant option;
 connect (user_a,localhost,mysqltest_1,,);
 connection user_a;
 --error 1410
 grant select on `my\_1`.* to mysqltest_2@localhost;
+create user mysqltest_2@localhost;
 disconnect user_a;
 connection default;