Commit c9659f0e authored by unknown's avatar unknown
Browse files

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
parent d27a709f

mysql-test/r/grant2.result

+6 −8
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ select current_user; 
current_user

mysqltest_1@localhost

grant all privileges on `my\_1`.* to mysqltest_2@localhost with grant option;

ERROR 42000: 'mysqltest_1'@'localhost' is not allowed to create new users

grant all privileges on `my_%`.* to mysqltest_3@localhost with grant option;

ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'my_%'

set @@sql_mode='NO_AUTO_CREATE_USER';
@@ -39,16 +38,17 @@ select @@sql_mode; 
@@sql_mode

NO_AUTO_CREATE_USER

grant select on `my\_1`.* to mysqltest_4@localhost with grant option;

ERROR 42000: 'mysqltest_1'@'localhost' is not allowed to create new users

ERROR 42000: Can't find any matching row in the user table

grant select on `my\_1`.* to mysqltest_4@localhost identified by 'mypass'

with grant option;

ERROR 42000: 'mysqltest_1'@'localhost' is not allowed to create new users

show grants for mysqltest_1@localhost;

Grants for mysqltest_1@localhost

GRANT CREATE USER ON *.* TO 'mysqltest_1'@'localhost'

GRANT ALL PRIVILEGES ON `my\_%`.* TO 'mysqltest_1'@'localhost' WITH GRANT OPTION

show grants for mysqltest_2@localhost;

ERROR 42000: There is no such grant defined for user 'mysqltest_2' on host 'localhost'

Grants for mysqltest_2@localhost

GRANT USAGE ON *.* TO 'mysqltest_2'@'localhost'

GRANT ALL PRIVILEGES ON `my\_1`.* TO 'mysqltest_2'@'localhost' WITH GRANT OPTION

show grants for mysqltest_3@localhost;

ERROR 42000: There is no such grant defined for user 'mysqltest_3' on host 'localhost'

delete from mysql.user where user like 'mysqltest\_%';
@@ -78,9 +78,9 @@ flush privileges; 
create table t1 (a int, b int);

grant select (a) on t1 to mysqltest_1@localhost with grant option;

grant select (a,b) on t1 to mysqltest_2@localhost;

ERROR 42000: 'mysqltest_1'@'localhost' is not allowed to create new users

ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for column 'b' in table 't1'

grant select on t1 to mysqltest_3@localhost;

ERROR 42000: 'mysqltest_1'@'localhost' is not allowed to create new users

ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 't1'

drop table t1;

delete from mysql.user where user like 'mysqltest\_%';

delete from mysql.db where user like 'mysqltest\_%';
@@ -165,8 +165,6 @@ GRANT INSERT ON "test".* TO 'mysqltest_1'@'%' 
GRANT UPDATE (c2) ON "test"."t2" TO 'mysqltest_1'@'%'

GRANT UPDATE ON "test"."t1" TO 'mysqltest_1'@'%'

drop user 'mysqltest_1', 'mysqltest_3';

grant all on test.t1 to 'mysqltest_1';

ERROR HY000: You are not allowed to create a user with GRANT

drop user 'mysqltest_1';

ERROR HY000: Operation DROP USER failed for 'mysqltest_1'@'%'

drop table t1, t2;

mysql-test/r/grant3.result

+3 −2
Original line number Diff line number Diff line
@@ -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\_%';

mysql-test/r/rpl_temporary.result

+2 −2
Original line number Diff line number Diff line
@@ -7,12 +7,12 @@ start slave; 
reset master;

SET @save_select_limit=@@session.sql_select_limit;

SET @@session.sql_select_limit=10, @@session.pseudo_thread_id=100;

ERROR HY000: Access denied; you need the SUPER privilege for this operation

ERROR 42000: Access denied; you need the SUPER privilege for this operation

SELECT @@session.sql_select_limit = @save_select_limit;

@@session.sql_select_limit = @save_select_limit

1

SET @@session.sql_select_limit=10, @@session.sql_log_bin=0;

ERROR HY000: Access denied; you need the SUPER privilege for this operation

ERROR 42000: Access denied; you need the SUPER privilege for this operation

SELECT @@session.sql_select_limit = @save_select_limit;

@@session.sql_select_limit = @save_select_limit

1

mysql-test/t/grant2.test

+6 −9
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ connect (user1,localhost,mysqltest_1,,); 
connection user1;

select current_user();

select current_user;

--error 1211

grant all privileges on `my\_1`.* to mysqltest_2@localhost with grant option;

--error 1044

grant all privileges on `my_%`.* to mysqltest_3@localhost with grant option;
@@ -67,14 +66,16 @@ grant all privileges on `my_%`.* to mysqltest_3@localhost with grant option; 
#

set @@sql_mode='NO_AUTO_CREATE_USER';

select @@sql_mode;

--error 1211

#

# GRANT without IDENTIFIED BY does not create new users

#

--error 1133

grant select on `my\_1`.* to mysqltest_4@localhost with grant option;

grant select on `my\_1`.* to mysqltest_4@localhost identified by 'mypass'

with grant option;

disconnect user1;

connection default;

show grants for mysqltest_1@localhost;

--error 1141

show grants for mysqltest_2@localhost;

--error 1141

show grants for mysqltest_3@localhost;
@@ -116,9 +117,9 @@ create table t1 (a int, b int); 
grant select (a) on t1 to mysqltest_1@localhost with grant option;

connect (mrugly, localhost, mysqltest_1,,mysqltest);

connection mrugly;

--error 1211

--error 1143

grant select (a,b) on t1 to mysqltest_2@localhost;

--error 1211

--error 1142

grant select on t1 to mysqltest_3@localhost;

disconnect mrugly;
@@ -177,10 +178,6 @@ select host,db,user,table_name from mysql.tables_priv where user like 'mysqltest 
select host,db,user,table_name,column_name from mysql.columns_priv where user like 'mysqltest_%' order by host,db,user,table_name,column_name;

show grants for 'mysqltest_1';

drop user 'mysqltest_1', 'mysqltest_3';

#

# Grant must not create user

--error 1410

grant all on test.t1 to 'mysqltest_1';

--error 1396

drop user 'mysqltest_1';

#

mysql-test/t/grant3.test

+2 −1
Original line number Diff line number Diff line
@@ -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;