diff options
| author | unknown <serg@serg.mylan> | 2005-03-23 19:18:25 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-03-23 19:18:25 +0100 |
| commit | c9659f0e6ddad0f9d550d5d871f5288f00f000da (patch) | |
| tree | c81ed81f8edf508e7b1bccb6abe3f8785be6b857 /mysql-test/r/grant3.result | |
| parent | d27a709f3d811718c4174beeb0bd2d964bfcf87c (diff) | |
| download | mariadb-git-c9659f0e6ddad0f9d550d5d871f5288f00f000da.tar.gz | |
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
Diffstat (limited to 'mysql-test/r/grant3.result')
| -rw-r--r-- | mysql-test/r/grant3.result | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/r/grant3.result b/mysql-test/r/grant3.result index ae37db3af42..6193c4fd49d 100644 --- a/mysql-test/r/grant3.result +++ b/mysql-test/r/grant3.result @@ -6,10 +6,11 @@ delete from mysql.tables_priv where user like 'mysqltest\_%'; 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; grant select on `my\_1`.* to mysqltest_2@localhost; -ERROR HY000: You are not allowed to create a user with GRANT +ERROR 42000: You are not allowed to create a user with GRANT +create user mysqltest_2@localhost; delete from mysql.user where user like 'mysqltest\_%'; delete from mysql.db where user like 'mysqltest\_%'; delete from mysql.tables_priv where user like 'mysqltest\_%'; |