Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new (0b88ef9d) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/grant.result

+14 −13

Original line number	Diff line number	Diff line
		@@ -11,8 +11,8 @@ GRANT USAGE ON . TO 'mysqltest_1'@'localhost' REQUIRE CIPHER 'EDH-RSA-DES-CBC3
		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 Create_user_priv Event_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 N N SPECIFIED EDH-RSA-DES-CBC3-SHA 0 0 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 Create_user_priv Event_priv Trigger_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 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'
		@@ -42,15 +42,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 Create_view_priv Show_view_priv Create_routine_priv Alter_routine_priv Create_user_priv Event_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 N N 10 0 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 Create_user_priv Event_priv Trigger_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 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 Create_view_priv Show_view_priv Create_routine_priv Alter_routine_priv Create_user_priv Event_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 N N 10 20 30 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 Create_user_priv Event_priv Trigger_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 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
		@@ -85,7 +85,7 @@ revoke LOCK TABLES, ALTER on mysqltest.* from mysqltest_1@localhost;
		show grants for mysqltest_1@localhost;
		Grants for mysqltest_1@localhost
		GRANT USAGE ON . TO 'mysqltest_1'@'localhost'
		GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, CREATE TEMPORARY TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT ON `mysqltest`.* TO 'mysqltest_1'@'localhost' WITH GRANT OPTION
		GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, CREATE TEMPORARY TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `mysqltest`.* TO 'mysqltest_1'@'localhost' WITH GRANT OPTION
		revoke all privileges on mysqltest.* from mysqltest_1@localhost;
		delete from mysql.user where user='mysqltest_1';
		flush privileges;
		@@ -465,6 +465,7 @@ Show databases Server Admin To see all databases with SHOW DATABASES
		Show view Tables To see views with SHOW CREATE VIEW
		Shutdown Server Admin To shut down the server
		Super Server Admin To use KILL thread, SET GLOBAL, CHANGE MASTER, etc.
		Trigger Tables To use triggers
		Update Tables To update existing rows
		Usage Server Admin No privileges - allow connect only
		create database mysqltest;
		@@ -491,8 +492,8 @@ SELECT TABLE_SCHEMA, TABLE_NAME, GROUP_CONCAT(PRIVILEGE_TYPE ORDER BY
		PRIVILEGE_TYPE SEPARATOR ', ') AS PRIVILEGES FROM TABLE_PRIVILEGES WHERE GRANTEE
		= '\'dummy\'@\'localhost\'' GROUP BY TABLE_SCHEMA, TABLE_NAME;
		TABLE_SCHEMA TABLE_NAME PRIVILEGES
		mysqltest dummytable ALTER, CREATE, CREATE VIEW, DELETE, DROP, INDEX, INSERT, REFERENCES, SELECT, SHOW VIEW, UPDATE
		mysqltest dummyview ALTER, CREATE, CREATE VIEW, DELETE, DROP, INDEX, INSERT, REFERENCES, SELECT, SHOW VIEW, UPDATE
		mysqltest dummytable ALTER, CREATE, CREATE VIEW, DELETE, DROP, INDEX, INSERT, REFERENCES, SELECT, SHOW VIEW, TRIGGER, UPDATE
		mysqltest dummyview ALTER, CREATE, CREATE VIEW, DELETE, DROP, INDEX, INSERT, REFERENCES, SELECT, SHOW VIEW, TRIGGER, UPDATE
		FLUSH PRIVILEGES;
		SHOW GRANTS FOR dummy@localhost;
		Grants for dummy@localhost
		@@ -503,8 +504,8 @@ SELECT TABLE_SCHEMA, TABLE_NAME, GROUP_CONCAT(PRIVILEGE_TYPE ORDER BY
		PRIVILEGE_TYPE SEPARATOR ', ') AS PRIVILEGES FROM TABLE_PRIVILEGES WHERE GRANTEE
		= '\'dummy\'@\'localhost\'' GROUP BY TABLE_SCHEMA, TABLE_NAME;
		TABLE_SCHEMA TABLE_NAME PRIVILEGES
		mysqltest dummytable ALTER, CREATE, CREATE VIEW, DELETE, DROP, INDEX, INSERT, REFERENCES, SELECT, SHOW VIEW, UPDATE
		mysqltest dummyview ALTER, CREATE, CREATE VIEW, DELETE, DROP, INDEX, INSERT, REFERENCES, SELECT, SHOW VIEW, UPDATE
		mysqltest dummytable ALTER, CREATE, CREATE VIEW, DELETE, DROP, INDEX, INSERT, REFERENCES, SELECT, SHOW VIEW, TRIGGER, UPDATE
		mysqltest dummyview ALTER, CREATE, CREATE VIEW, DELETE, DROP, INDEX, INSERT, REFERENCES, SELECT, SHOW VIEW, TRIGGER, UPDATE
		SHOW FIELDS FROM mysql.tables_priv;
		Field Type Null Key Default Extra
		Host char(60) NO PRI
		@@ -513,7 +514,7 @@ User char(16) NO PRI
		Table_name char(64) NO PRI
		Grantor char(77) NO MUL
		Timestamp timestamp YES CURRENT_TIMESTAMP
		Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view') NO
		Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger') NO
		Column_priv set('Select','Insert','Update','References') NO
		use test;
		REVOKE ALL PRIVILEGES, GRANT OPTION FROM dummy@localhost;
		@@ -594,7 +595,7 @@ delete from tables_priv where host = '' and user = 'mysqltest_1';
		flush privileges;
		set @user123="non-existent";
		select * from mysql.db where user=@user123;
		Host Db User Select_priv Insert_priv Update_priv Delete_priv Create_priv Drop_priv Grant_priv References_priv Index_priv Alter_priv Create_tmp_table_priv Lock_tables_priv Create_view_priv Show_view_priv Create_routine_priv Alter_routine_priv Execute_priv Event_priv
		Host Db User Select_priv Insert_priv Update_priv Delete_priv Create_priv Drop_priv Grant_priv References_priv Index_priv Alter_priv Create_tmp_table_priv Lock_tables_priv Create_view_priv Show_view_priv Create_routine_priv Alter_routine_priv Execute_priv Event_priv Trigger_priv
		set names koi8r;
		create database ;
		grant select on .* to root@localhost;

mysql-test/r/information_schema.result

+1 −0

Original line number	Diff line number	Diff line
		@@ -406,6 +406,7 @@ GRANTEE TABLE_CATALOG TABLE_SCHEMA PRIVILEGE_TYPE IS_GRANTABLE
		'mysqltest_1'@'localhost' NULL test CREATE ROUTINE YES
		'mysqltest_1'@'localhost' NULL test ALTER ROUTINE YES
		'mysqltest_1'@'localhost' NULL test EVENT YES
		'mysqltest_1'@'localhost' NULL test TRIGGER YES
		select * from information_schema.TABLE_PRIVILEGES where grantee like '%mysqltest_1%';
		GRANTEE TABLE_CATALOG TABLE_SCHEMA TABLE_NAME PRIVILEGE_TYPE IS_GRANTABLE
		'mysqltest_1'@'localhost' NULL test t1 SELECT NO

mysql-test/r/lowercase_table_grant.result

+4 −4

Original line number	Diff line number	Diff line
		@@ -6,8 +6,8 @@ Grants for mysqltest_1@localhost
		GRANT USAGE ON . TO 'mysqltest_1'@'localhost'
		GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_1'@'localhost'
		select * from db where user = 'mysqltest_1';
		Host Db User Select_priv Insert_priv Update_priv Delete_priv Create_priv Drop_priv Grant_priv References_priv Index_priv Alter_priv Create_tmp_table_priv Lock_tables_priv Create_view_priv Show_view_priv Create_routine_priv Alter_routine_priv Execute_priv Event_priv
		localhost mysqltest mysqltest_1 Y Y Y Y Y Y N Y Y Y Y Y Y Y Y Y Y Y
		Host Db User Select_priv Insert_priv Update_priv Delete_priv Create_priv Drop_priv Grant_priv References_priv Index_priv Alter_priv Create_tmp_table_priv Lock_tables_priv Create_view_priv Show_view_priv Create_routine_priv Alter_routine_priv Execute_priv Event_priv Trigger_priv
		localhost mysqltest mysqltest_1 Y Y Y Y Y Y N Y Y Y Y Y Y Y Y Y Y Y Y
		update db set db = 'MYSQLtest' where db = 'mysqltest' and user = 'mysqltest_1' and host = 'localhost';
		flush privileges;
		show grants for mysqltest_1@localhost;
		@@ -15,8 +15,8 @@ Grants for mysqltest_1@localhost
		GRANT USAGE ON . TO 'mysqltest_1'@'localhost'
		GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_1'@'localhost'
		select * from db where user = 'mysqltest_1';
		Host Db User Select_priv Insert_priv Update_priv Delete_priv Create_priv Drop_priv Grant_priv References_priv Index_priv Alter_priv Create_tmp_table_priv Lock_tables_priv Create_view_priv Show_view_priv Create_routine_priv Alter_routine_priv Execute_priv Event_priv
		localhost MYSQLtest mysqltest_1 Y Y Y Y Y Y N Y Y Y Y Y Y Y Y Y Y Y
		Host Db User Select_priv Insert_priv Update_priv Delete_priv Create_priv Drop_priv Grant_priv References_priv Index_priv Alter_priv Create_tmp_table_priv Lock_tables_priv Create_view_priv Show_view_priv Create_routine_priv Alter_routine_priv Execute_priv Event_priv Trigger_priv
		localhost MYSQLtest mysqltest_1 Y Y Y Y Y Y N Y Y Y Y Y Y Y Y Y Y Y Y
		delete from db where db = 'MYSQLtest' and user = 'mysqltest_1' and host = 'localhost';
		flush privileges;
		drop user mysqltest_1@localhost;

mysql-test/r/ps.result

+3 −3

Original line number	Diff line number	Diff line
		@@ -533,13 +533,13 @@ SET @aux= "SELECT COUNT(*)
		prepare my_stmt from @aux;
		execute my_stmt;
		COUNT(*)
		38
		39
		execute my_stmt;
		COUNT(*)
		38
		39
		execute my_stmt;
		COUNT(*)
		38
		39
		deallocate prepare my_stmt;
		drop procedure if exists p1\|
		drop table if exists t1\|

mysql-test/r/sp.result

+2 −0

Original line number	Diff line number	Diff line
		@@ -2197,6 +2197,7 @@ Show databases Server Admin To see all databases with SHOW DATABASES
		Show view Tables To see views with SHOW CREATE VIEW
		Shutdown Server Admin To shut down the server
		Super Server Admin To use KILL thread, SET GLOBAL, CHANGE MASTER, etc.
		Trigger Tables To use triggers
		Update Tables To update existing rows
		Usage Server Admin No privileges - allow connect only
		Variable_name Value
		@@ -2250,6 +2251,7 @@ Show databases Server Admin To see all databases with SHOW DATABASES
		Show view Tables To see views with SHOW CREATE VIEW
		Shutdown Server Admin To shut down the server
		Super Server Admin To use KILL thread, SET GLOBAL, CHANGE MASTER, etc.
		Trigger Tables To use triggers
		Update Tables To update existing rows
		Usage Server Admin No privileges - allow connect only
		Variable_name Value