Commit 31c4511d authored by unknown's avatar unknown
Browse files

post-merge

parent b99bea67

mysql-test/r/grant.result

+11 −11
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ GRANT SELECT ON `mysqltest`.* TO 'mysqltest_1'@'localhost' 
grant delete on mysqltest.* to mysqltest_1@localhost;

select * from mysql.user where user="mysqltest_1";

Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections

localhost	mysqltest_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N									0	0	0	0

localhost	mysqltest_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	SPECIFIED	EDH-RSA-DES-CBC3-SHA			0	0	0	0

show grants for mysqltest_1@localhost;

Grants for mysqltest_1@localhost

GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' REQUIRE CIPHER 'EDH-RSA-DES-CBC3-SHA'
@@ -41,15 +41,15 @@ delete from mysql.user where user='mysqltest_1'; 
flush privileges;

grant usage on *.* to mysqltest_1@localhost with max_queries_per_hour 10;

select * from mysql.user where user="mysqltest_1";

Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections

localhost	mysqltest_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					10	0	0

Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections

localhost	mysqltest_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					10	0	0	0

show grants for mysqltest_1@localhost;

Grants for mysqltest_1@localhost

GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' WITH MAX_QUERIES_PER_HOUR 10

grant usage on *.* to mysqltest_1@localhost with max_updates_per_hour 20 max_connections_per_hour 30;

select * from mysql.user where user="mysqltest_1";

Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections

localhost	mysqltest_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					10	20	30

Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections

localhost	mysqltest_1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					10	20	30	0

show grants for mysqltest_1@localhost;

Grants for mysqltest_1@localhost

GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' WITH MAX_QUERIES_PER_HOUR 10 MAX_UPDATES_PER_HOUR 20 MAX_CONNECTIONS_PER_HOUR 30
@@ -388,9 +388,9 @@ ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for column 
update mysqltest_1.t2, mysqltest_2.t2 set d=20 where d=1;

ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for column 'd' in table 't2'

update mysqltest_1.t1, mysqltest_2.t2 set d=20 where d=1;

ERROR 42000: select command denied to user 'mysqltest_3'@'localhost' for table 't1'

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

update mysqltest_2.t1, mysqltest_1.t2 set c=20 where b=1;

ERROR 42000: update command denied to user 'mysqltest_3'@'localhost' for table 't1'

ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for table 't1'

update mysqltest_2.t1, mysqltest_2.t2 set d=10 where s=2;

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

update mysqltest_1.t1, mysqltest_2.t2 set a=10,d=10;
@@ -411,14 +411,14 @@ flush privileges; 
use mysqltest_1;

update mysqltest_2.t1, mysqltest_2.t2 set c=500,d=600;

update mysqltest_1.t1, mysqltest_1.t2 set a=100,b=200;

ERROR 42000: update command denied to user 'mysqltest_3'@'localhost' for table 't1'

ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for table 't1'

use mysqltest_2;

update mysqltest_1.t1, mysqltest_1.t2 set a=100,b=200;

ERROR 42000: update command denied to user 'mysqltest_3'@'localhost' for table 't1'

ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for table 't1'

update mysqltest_2.t1, mysqltest_1.t2 set c=100,b=200;

ERROR 42000: update command denied to user 'mysqltest_3'@'localhost' for table 't2'

ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for table 't2'

update mysqltest_1.t1, mysqltest_2.t2 set a=100,d=200;

ERROR 42000: update command denied to user 'mysqltest_3'@'localhost' for table 't1'

ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for table 't1'

select t1.*,t2.* from mysqltest_1.t1,mysqltest_1.t2;

a	q	b	r

10	2	1	2

mysql-test/r/grant2.result

+17 −17
Original line number Diff line number Diff line
@@ -47,9 +47,9 @@ GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' 
GRANT SELECT, INSERT ON `mysqltest`.* TO 'mysqltest_1'@'localhost'

insert into t1 values (1, 'I can''t change it!');

update t1 set data='I can change it!' where id = 1;

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

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

insert into t1 values (1, 'XXX') on duplicate key update data= 'I can change it!';

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

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

select * from t1;

id	data

1	I can't change it!
@@ -57,6 +57,20 @@ drop table t1; 
delete from mysql.user where user like 'mysqltest\_%';

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

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: SELECT command denied to user 'mysqltest_1'@'localhost' for column 'b' in table 't1'

grant select on t1 to mysqltest_3@localhost;

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\_%';

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

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

flush privileges;

drop database mysqltest;

use test;

set sql_mode='maxdb';

drop table if exists t1, t2;

create table t1(c1 int);
@@ -199,7 +213,7 @@ drop user '%@a'@'a'; 
create user mysqltest_2@localhost;

grant usage on *.* to mysqltest_2@localhost with grant option;

select host,user,password from mysql.user where user like 'mysqltest_%' order by host,user,password;

ERROR 42000: select command denied to user 'mysqltest_2'@'localhost' for table 'user'

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

create user mysqltest_A@'%';

rename user mysqltest_A@'%' to mysqltest_B@'%';

drop user mysqltest_B@'%';
@@ -219,17 +233,3 @@ drop user mysqltest_B@'%'; 
ERROR 42000: Access denied for user 'mysqltest_3'@'localhost' to database 'mysql'

drop user mysqltest_B@'%';

drop user mysqltest_3@localhost;
 
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: SELECT command denied to user 'mysqltest_1'@'localhost' for column 'b' in table 't1'

grant select on t1 to mysqltest_3@localhost;

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\_%';

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

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

flush privileges;

drop database mysqltest;

use test;

mysql-test/r/mysqldump.result

+1 −2
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1, `"t"1`;

drop database if exists mysqldump_test_db;

CREATE TABLE t1(a int);

INSERT INTO t1 VALUES (1), (2);

<?xml version="1.0"?>
@@ -387,7 +388,6 @@ USE `test`; 
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;

/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;



drop database mysqldump_test_db;

create database mysqldump_test_db character set latin2 collate latin2_bin;



/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
@@ -549,4 +549,3 @@ UNLOCK TABLES; 


DROP TABLE t1;

DROP TABLE t2;
 
drop database mysqldump_test_db;

mysql-test/r/show_check.result

+4 −4
Original line number Diff line number Diff line
@@ -382,19 +382,19 @@ show create database mysqltest; 
Database	Create Database

mysqltest	CREATE DATABASE `mysqltest` /*!40100 DEFAULT CHARACTER SET latin1 */

drop table t1;

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

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

drop database mysqltest;

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

select * from mysqltest.t1;

ERROR 42000: select command denied to user 'mysqltest_2'@'localhost' for table 't1'

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

show create database mysqltest;

ERROR 42000: Access denied for user 'mysqltest_2'@'localhost' to database 'mysqltest'

drop table mysqltest.t1;

ERROR 42000: drop command denied to user 'mysqltest_2'@'localhost' for table 't1'

ERROR 42000: DROP command denied to user 'mysqltest_2'@'localhost' for table 't1'

drop database mysqltest;

ERROR 42000: Access denied for user 'mysqltest_2'@'localhost' to database 'mysqltest'

select * from mysqltest.t1;

ERROR 42000: select command denied to user 'mysqltest_3'@'localhost' for table 't1'

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

show create database mysqltest;

ERROR 42000: Access denied for user 'mysqltest_3'@'localhost' to database 'mysqltest'

drop table mysqltest.t1;

mysql-test/r/sp-security.result

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ select db1_secret.db(); 
db1_secret.db()

db1_secret

select * from db1_secret.t1;

ERROR 42000: select command denied to user 'user1'@'localhost' for table 't1'

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

create procedure db1_secret.dummy() begin end;

ERROR 42000: Access denied for user 'user1'@'localhost' to database 'db1_secret'

drop procedure db1_secret.dummy;
@@ -42,7 +42,7 @@ select db1_secret.db(); 
db1_secret.db()

db1_secret

select * from db1_secret.t1;

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

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

create procedure db1_secret.dummy() begin end;

ERROR 42000: Access denied for user ''@'localhost' to database 'db1_secret'

drop procedure db1_secret.dummy;
@@ -92,7 +92,7 @@ flush privileges; 
use db2;

create procedure p () insert into t2 values (1);

call p();

ERROR 42000: insert command denied to user 'user1'@'localhost' for table 't2'

ERROR 42000: INSERT command denied to user 'user1'@'localhost' for table 't2'

use db2;

call p();

ERROR 42000: execute command denied to user 'user2'@'localhost' for routine 'db2.p'