mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 23:34:34 +01:00
45199f545c
Cleanup of mi_print_error() handling Deleted 'merge' directory BitKeeper/deleted/.del-mrg_close.c~1fa9230422daa62a: Delete: merge/mrg_close.c BitKeeper/deleted/.del-mrg_create.c~b747c8ec2b801f6: Delete: merge/mrg_create.c BitKeeper/deleted/.del-mrg_delete.c~38b4156885bb4537: Delete: merge/mrg_delete.c BitKeeper/deleted/.del-mrg_extra.c~7eb6181e1761907e: Delete: merge/mrg_extra.c BitKeeper/deleted/.del-mrg_info.c~37728e7238cc5a11: Delete: merge/mrg_info.c BitKeeper/deleted/.del-mrg_locking.c~112756a2d581e1d0: Delete: merge/mrg_locking.c BitKeeper/deleted/.del-mrg_open.c~6e1d5c8bfa62a519: Delete: merge/mrg_open.c BitKeeper/deleted/.del-mrg_panic.c~e204e43cd6d55406: Delete: merge/mrg_panic.c BitKeeper/deleted/.del-mrg_rrnd.c~6087c3dd7ecb77: Delete: merge/mrg_rrnd.c BitKeeper/deleted/.del-mrg_rsame.c~3e8ed4be2a0952b1: Delete: merge/mrg_rsame.c BitKeeper/deleted/.del-mrg_static.c~75a4b78a165dbd0: Delete: merge/mrg_static.c BitKeeper/deleted/.del-mrg_update.c~4110a4f1fbf1ab45: Delete: merge/mrg_update.c BitKeeper/deleted/.del-Makefile.am~41238af048e60515: Delete: merge/Makefile.am BitKeeper/deleted/.del-make-ccc~4f1acbfc127e25d5: Delete: merge/make-ccc BitKeeper/deleted/.del-mrg_def.h~a10557d12a87ef1c: Delete: merge/mrg_def.h BitKeeper/deleted/.del-.cvsignore~2f287ba794db3da7: Delete: merge/.cvsignore include/myisam.h: Added 'share' to st_mi_keydef' to not have to pass 'st_myisam_info' to functions myisam/ft_static.c: Removed compiler warning myisam/mi_delete.c: Cleanup of mi_print_error() handling Break if get_key() return 0 Don't test for HA_ERR_CRASHED; Print errors when my_errno is set myisam/mi_extra.c: Cleanup of mi_print_error() handling myisam/mi_key.c: Cleanup of mi_print_error() handling myisam/mi_keycache.c: Cleanup of mi_print_error() handling myisam/mi_locking.c: Cleanup of mi_print_error() handling myisam/mi_open.c: Added 'my_isam_share' to MI_KEYDEF myisam/mi_page.c: Cleanup of mi_print_error() handling myisam/mi_range.c: get_key() calls mi_print_error() if needed myisam/mi_rkey.c: Cleanup of mi_print_error() handling myisam/mi_search.c: Cleanup of mi_print_error() handling Break if get_key() return 0 Don't test for HA_ERR_CRASHED; Print errors when my_errno is set myisam/mi_update.c: Cleanup of mi_print_error() handling myisam/mi_write.c: Cleanup of mi_print_error() handling Break if get_key() return 0 Don't test for HA_ERR_CRASHED; Print errors when my_errno is set myisam/myisamdef.h: Cleanup of mi_print_error() handling mysql-test/r/grant.result: Update results after merge mysql-test/r/timezone2.result: Update results after merge mysql-test/t/grant.test: New error numbers mysql-test/t/timezone2.test: New error numbers sql/item_func.cc: Remove duplicate include file sql/sql_acl.cc: Remove warnings from valgrind sql/tztime.cc: Print wrong timezone names to log
366 lines
13 KiB
Text
366 lines
13 KiB
Text
# Test of GRANT commands
|
||
|
||
# Cleanup
|
||
--disable_warnings
|
||
drop table if exists t1;
|
||
--enable_warnings
|
||
|
||
connect (master,localhost,root,,);
|
||
connection master;
|
||
SET NAMES binary;
|
||
|
||
#
|
||
# Test that SSL options works properly
|
||
#
|
||
|
||
delete from mysql.user where user='mysqltest_1';
|
||
delete from mysql.db where user='mysqltest_1';
|
||
flush privileges;
|
||
grant select on mysqltest.* to mysqltest_1@localhost require cipher "EDH-RSA-DES-CBC3-SHA";
|
||
show grants for mysqltest_1@localhost;
|
||
grant delete on mysqltest.* to mysqltest_1@localhost;
|
||
select * from mysql.user where user="mysqltest_1";
|
||
show grants for mysqltest_1@localhost;
|
||
revoke delete on mysqltest.* from mysqltest_1@localhost;
|
||
show grants for mysqltest_1@localhost;
|
||
grant select on mysqltest.* to mysqltest_1@localhost require NONE;
|
||
show grants for mysqltest_1@localhost;
|
||
grant USAGE on mysqltest.* to mysqltest_1@localhost require cipher "EDH-RSA-DES-CBC3-SHA" AND SUBJECT "testsubject" ISSUER "MySQL AB";
|
||
show grants for mysqltest_1@localhost;
|
||
revoke all privileges on mysqltest.* from mysqltest_1@localhost;
|
||
show grants for mysqltest_1@localhost;
|
||
delete from mysql.user where user='mysqltest_1';
|
||
flush privileges;
|
||
|
||
#
|
||
# Test that the new db privileges are stored/retrieved correctly
|
||
#
|
||
|
||
grant CREATE TEMPORARY TABLES, LOCK TABLES on mysqltest.* to mysqltest_1@localhost;
|
||
show grants for mysqltest_1@localhost;
|
||
flush privileges;
|
||
show grants for mysqltest_1@localhost;
|
||
revoke CREATE TEMPORARY TABLES on mysqltest.* from mysqltest_1@localhost;
|
||
show grants for mysqltest_1@localhost;
|
||
grant ALL PRIVILEGES on mysqltest.* to mysqltest_1@localhost with GRANT OPTION;
|
||
flush privileges;
|
||
show grants for mysqltest_1@localhost;
|
||
revoke LOCK TABLES, ALTER on mysqltest.* from mysqltest_1@localhost;
|
||
show grants for mysqltest_1@localhost;
|
||
revoke all privileges on mysqltest.* from mysqltest_1@localhost;
|
||
delete from mysql.user where user='mysqltest_1';
|
||
flush privileges;
|
||
grant usage on test.* to mysqltest_1@localhost with grant option;
|
||
show grants for mysqltest_1@localhost;
|
||
delete from mysql.user where user='mysqltest_1';
|
||
delete from mysql.db where user='mysqltest_1';
|
||
delete from mysql.tables_priv where user='mysqltest_1';
|
||
delete from mysql.columns_priv where user='mysqltest_1';
|
||
flush privileges;
|
||
--error 1141
|
||
show grants for mysqltest_1@localhost;
|
||
|
||
#
|
||
# Test what happens when you have same table and colum level grants
|
||
#
|
||
|
||
create table t1 (a int);
|
||
GRANT select,update,insert on t1 to mysqltest_1@localhost;
|
||
GRANT select (a), update (a),insert(a), references(a) on t1 to mysqltest_1@localhost;
|
||
show grants for mysqltest_1@localhost;
|
||
select table_priv,column_priv from mysql.tables_priv where user="mysqltest_1";
|
||
REVOKE select (a), update on t1 from mysqltest_1@localhost;
|
||
show grants for mysqltest_1@localhost;
|
||
REVOKE select,update,insert,insert (a) on t1 from mysqltest_1@localhost;
|
||
show grants for mysqltest_1@localhost;
|
||
GRANT select,references on t1 to mysqltest_1@localhost;
|
||
select table_priv,column_priv from mysql.tables_priv where user="mysqltest_1";
|
||
grant all on test.* to mysqltest_3@localhost with grant option;
|
||
revoke all on test.* from mysqltest_3@localhost;
|
||
show grants for mysqltest_3@localhost;
|
||
revoke grant option on test.* from mysqltest_3@localhost;
|
||
show grants for mysqltest_3@localhost;
|
||
grant all on test.t1 to mysqltest_2@localhost with grant option;
|
||
revoke all on test.t1 from mysqltest_2@localhost;
|
||
show grants for mysqltest_2@localhost;
|
||
revoke grant option on test.t1 from mysqltest_2@localhost;
|
||
show grants for mysqltest_2@localhost;
|
||
delete from mysql.user where user='mysqltest_1' or user="mysqltest_2" or user="mysqltest_3";
|
||
delete from mysql.db where user='mysqltest_1' or user="mysqltest_2" or user="mysqltest_3";
|
||
delete from mysql.tables_priv where user='mysqltest_1' or user="mysqltest_2" or user="mysqltest_3";
|
||
delete from mysql.columns_priv where user='mysqltest_1' or user="mysqltest_2" or user="mysqltest_3";
|
||
flush privileges;
|
||
drop table t1;
|
||
|
||
#
|
||
# Test some error conditions
|
||
#
|
||
--error 1221
|
||
GRANT FILE on mysqltest.* to mysqltest_1@localhost;
|
||
select 1; -- To test that the previous command didn't cause problems
|
||
|
||
#
|
||
# Bug #4898: User privileges depending on ORDER BY Settings of table db
|
||
#
|
||
insert into mysql.user (host, user) values ('localhost', 'test11');
|
||
insert into mysql.db (host, db, user, select_priv) values
|
||
('localhost', 'a%', 'test11', 'Y'), ('localhost', 'ab%', 'test11', 'Y');
|
||
alter table mysql.db order by db asc;
|
||
flush privileges;
|
||
show grants for test11@localhost;
|
||
alter table mysql.db order by db desc;
|
||
flush privileges;
|
||
show grants for test11@localhost;
|
||
delete from mysql.user where user='test11';
|
||
delete from mysql.db where user='test11';
|
||
|
||
#
|
||
# Bug#6123: GRANT USAGE inserts useless Db row
|
||
#
|
||
create database mysqltest1;
|
||
grant usage on mysqltest1.* to test6123 identified by 'magic123';
|
||
select host,db,user,select_priv,insert_priv from mysql.db where db="mysqltest1";
|
||
delete from mysql.user where user='test6123';
|
||
drop database mysqltest1;
|
||
|
||
#
|
||
# Test for 'drop user', 'revoke privileges, grant'
|
||
#
|
||
|
||
create table t1 (a int);
|
||
grant ALL PRIVILEGES on *.* to drop_user2@localhost with GRANT OPTION;
|
||
show grants for drop_user2@localhost;
|
||
revoke all privileges, grant option from drop_user2@localhost;
|
||
drop user drop_user2@localhost;
|
||
|
||
grant ALL PRIVILEGES on *.* to drop_user@localhost with GRANT OPTION;
|
||
grant ALL PRIVILEGES on test.* to drop_user@localhost with GRANT OPTION;
|
||
grant select(a) on test.t1 to drop_user@localhost;
|
||
show grants for drop_user@localhost;
|
||
|
||
#
|
||
# Bug3086
|
||
#
|
||
set sql_mode=ansi_quotes;
|
||
show grants for drop_user@localhost;
|
||
set sql_mode=default;
|
||
|
||
set sql_quote_show_create=0;
|
||
show grants for drop_user@localhost;
|
||
set sql_mode="ansi_quotes";
|
||
show grants for drop_user@localhost;
|
||
set sql_quote_show_create=1;
|
||
show grants for drop_user@localhost;
|
||
set sql_mode="";
|
||
show grants for drop_user@localhost;
|
||
|
||
revoke all privileges, grant option from drop_user@localhost;
|
||
show grants for drop_user@localhost;
|
||
drop user drop_user@localhost;
|
||
--error 1269
|
||
revoke all privileges, grant option from drop_user@localhost;
|
||
|
||
grant select(a) on test.t1 to drop_user1@localhost;
|
||
grant select on test.t1 to drop_user2@localhost;
|
||
grant select on test.* to drop_user3@localhost;
|
||
grant select on *.* to drop_user4@localhost;
|
||
# Drop user now implicitly revokes all privileges.
|
||
drop user drop_user1@localhost, drop_user2@localhost, drop_user3@localhost,
|
||
drop_user4@localhost;
|
||
--error 1269
|
||
revoke all privileges, grant option from drop_user1@localhost, drop_user2@localhost,
|
||
drop_user3@localhost, drop_user4@localhost;
|
||
--error 1396
|
||
drop user drop_user1@localhost, drop_user2@localhost, drop_user3@localhost,
|
||
drop_user4@localhost;
|
||
drop table t1;
|
||
grant usage on *.* to mysqltest_1@localhost identified by "password";
|
||
grant select, update, insert on test.* to mysqltest_1@localhost;
|
||
show grants for mysqltest_1@localhost;
|
||
drop user mysqltest_1@localhost;
|
||
|
||
#
|
||
# Bug #3403 Wrong encodin in SHOW GRANTS output
|
||
#
|
||
SET NAMES koi8r;
|
||
CREATE DATABASE <20><>;
|
||
USE <20><>;
|
||
CREATE TABLE <20><><EFBFBD> (<28><><EFBFBD> int);
|
||
|
||
GRANT SELECT ON <20><>.* TO <20><><EFBFBD><EFBFBD>@localhost;
|
||
SHOW GRANTS FOR <20><><EFBFBD><EFBFBD>@localhost;
|
||
REVOKE SELECT ON <20><>.* FROM <20><><EFBFBD><EFBFBD>@localhost;
|
||
|
||
GRANT SELECT ON <20><>.<2E><><EFBFBD> TO <20><><EFBFBD><EFBFBD>@localhost;
|
||
SHOW GRANTS FOR <20><><EFBFBD><EFBFBD>@localhost;
|
||
REVOKE SELECT ON <20><>.<2E><><EFBFBD> FROM <20><><EFBFBD><EFBFBD>@localhost;
|
||
|
||
GRANT SELECT (<28><><EFBFBD>) ON <20><>.<2E><><EFBFBD> TO <20><><EFBFBD><EFBFBD>@localhost;
|
||
SHOW GRANTS FOR <20><><EFBFBD><EFBFBD>@localhost;
|
||
REVOKE SELECT (<28><><EFBFBD>) ON <20><>.<2E><><EFBFBD> FROM <20><><EFBFBD><EFBFBD>@localhost;
|
||
|
||
# Revoke does not drop user. Leave a clean user table for the next tests.
|
||
DROP USER <20><><EFBFBD><EFBFBD>@localhost;
|
||
|
||
DROP DATABASE <20><>;
|
||
SET NAMES latin1;
|
||
|
||
#
|
||
# Bug #5831: REVOKE ALL PRIVILEGES, GRANT OPTION does not revoke everything
|
||
#
|
||
USE test;
|
||
CREATE TABLE t1 (a int );
|
||
CREATE TABLE t2 LIKE t1;
|
||
CREATE TABLE t3 LIKE t1;
|
||
CREATE TABLE t4 LIKE t1;
|
||
CREATE TABLE t5 LIKE t1;
|
||
CREATE TABLE t6 LIKE t1;
|
||
CREATE TABLE t7 LIKE t1;
|
||
CREATE TABLE t8 LIKE t1;
|
||
CREATE TABLE t9 LIKE t1;
|
||
CREATE TABLE t10 LIKE t1;
|
||
CREATE DATABASE testdb1;
|
||
CREATE DATABASE testdb2;
|
||
CREATE DATABASE testdb3;
|
||
CREATE DATABASE testdb4;
|
||
CREATE DATABASE testdb5;
|
||
CREATE DATABASE testdb6;
|
||
CREATE DATABASE testdb7;
|
||
CREATE DATABASE testdb8;
|
||
CREATE DATABASE testdb9;
|
||
CREATE DATABASE testdb10;
|
||
GRANT ALL ON testdb1.* TO testuser@localhost;
|
||
GRANT ALL ON testdb2.* TO testuser@localhost;
|
||
GRANT ALL ON testdb3.* TO testuser@localhost;
|
||
GRANT ALL ON testdb4.* TO testuser@localhost;
|
||
GRANT ALL ON testdb5.* TO testuser@localhost;
|
||
GRANT ALL ON testdb6.* TO testuser@localhost;
|
||
GRANT ALL ON testdb7.* TO testuser@localhost;
|
||
GRANT ALL ON testdb8.* TO testuser@localhost;
|
||
GRANT ALL ON testdb9.* TO testuser@localhost;
|
||
GRANT ALL ON testdb10.* TO testuser@localhost;
|
||
GRANT SELECT ON test.t1 TO testuser@localhost;
|
||
GRANT SELECT ON test.t2 TO testuser@localhost;
|
||
GRANT SELECT ON test.t3 TO testuser@localhost;
|
||
GRANT SELECT ON test.t4 TO testuser@localhost;
|
||
GRANT SELECT ON test.t5 TO testuser@localhost;
|
||
GRANT SELECT ON test.t6 TO testuser@localhost;
|
||
GRANT SELECT ON test.t7 TO testuser@localhost;
|
||
GRANT SELECT ON test.t8 TO testuser@localhost;
|
||
GRANT SELECT ON test.t9 TO testuser@localhost;
|
||
GRANT SELECT ON test.t10 TO testuser@localhost;
|
||
GRANT SELECT (a) ON test.t1 TO testuser@localhost;
|
||
GRANT SELECT (a) ON test.t2 TO testuser@localhost;
|
||
GRANT SELECT (a) ON test.t3 TO testuser@localhost;
|
||
GRANT SELECT (a) ON test.t4 TO testuser@localhost;
|
||
GRANT SELECT (a) ON test.t5 TO testuser@localhost;
|
||
GRANT SELECT (a) ON test.t6 TO testuser@localhost;
|
||
GRANT SELECT (a) ON test.t7 TO testuser@localhost;
|
||
GRANT SELECT (a) ON test.t8 TO testuser@localhost;
|
||
GRANT SELECT (a) ON test.t9 TO testuser@localhost;
|
||
GRANT SELECT (a) ON test.t10 TO testuser@localhost;
|
||
REVOKE ALL PRIVILEGES, GRANT OPTION FROM testuser@localhost;
|
||
SHOW GRANTS FOR testuser@localhost;
|
||
DROP USER testuser@localhost;
|
||
DROP TABLE t1,t2,t3,t4,t5,t6,t7,t8,t9,t10;
|
||
DROP DATABASE testdb1;
|
||
DROP DATABASE testdb2;
|
||
DROP DATABASE testdb3;
|
||
DROP DATABASE testdb4;
|
||
DROP DATABASE testdb5;
|
||
DROP DATABASE testdb6;
|
||
DROP DATABASE testdb7;
|
||
DROP DATABASE testdb8;
|
||
DROP DATABASE testdb9;
|
||
DROP DATABASE testdb10;
|
||
|
||
#
|
||
# Bug #6932: a problem with 'revoke ALL PRIVILEGES'
|
||
#
|
||
|
||
create table t1(a int, b int, c int, d int);
|
||
grant insert(b), insert(c), insert(d), insert(a) on t1 to grant_user@localhost;
|
||
show grants for grant_user@localhost;
|
||
select Host,Db,User,Table_name,Column_name,Column_priv from mysql.columns_priv;
|
||
revoke ALL PRIVILEGES on t1 from grant_user@localhost;
|
||
show grants for grant_user@localhost;
|
||
select Host,Db,User,Table_name,Column_name,Column_priv from mysql.columns_priv;
|
||
drop user grant_user@localhost;
|
||
drop table t1;
|
||
|
||
#
|
||
# Bug#7391: Cross-database multi-table UPDATE security problem
|
||
#
|
||
create database mysqltest_1;
|
||
create database mysqltest_2;
|
||
create table mysqltest_1.t1 select 1 a, 2 q;
|
||
create table mysqltest_1.t2 select 1 b, 2 r;
|
||
create table mysqltest_2.t1 select 1 c, 2 s;
|
||
create table mysqltest_2.t2 select 1 d, 2 t;
|
||
|
||
#test the column privileges
|
||
grant update (a) on mysqltest_1.t1 to mysqltest_3@localhost;
|
||
grant select (b) on mysqltest_1.t2 to mysqltest_3@localhost;
|
||
grant select (c) on mysqltest_2.t1 to mysqltest_3@localhost;
|
||
grant update (d) on mysqltest_2.t2 to mysqltest_3@localhost;
|
||
connect (conn1,localhost,mysqltest_3,,);
|
||
connection conn1;
|
||
show grants for mysqltest_3@localhost;
|
||
--error 1143
|
||
update mysqltest_1.t1, mysqltest_1.t2 set q=10 where b=1;
|
||
--error 1143
|
||
update mysqltest_1.t2, mysqltest_2.t2 set d=20 where d=1;
|
||
--error 1142
|
||
update mysqltest_1.t1, mysqltest_2.t2 set d=20 where d=1;
|
||
--error 1142
|
||
update mysqltest_2.t1, mysqltest_1.t2 set c=20 where b=1;
|
||
--error 1143
|
||
update mysqltest_2.t1, mysqltest_2.t2 set d=10 where s=2;
|
||
#the following two should work
|
||
update mysqltest_1.t1, mysqltest_2.t2 set a=10,d=10;
|
||
update mysqltest_1.t1, mysqltest_2.t1 set a=20 where c=20;
|
||
connection master;
|
||
select t1.*,t2.* from mysqltest_1.t1,mysqltest_1.t2;
|
||
select t1.*,t2.* from mysqltest_2.t1,mysqltest_2.t2;
|
||
revoke all on mysqltest_1.t1 from mysqltest_3@localhost;
|
||
revoke all on mysqltest_1.t2 from mysqltest_3@localhost;
|
||
revoke all on mysqltest_2.t1 from mysqltest_3@localhost;
|
||
revoke all on mysqltest_2.t2 from mysqltest_3@localhost;
|
||
|
||
#test the db/table level privileges
|
||
grant all on mysqltest_2.* to mysqltest_3@localhost;
|
||
grant select on *.* to mysqltest_3@localhost;
|
||
flush privileges;
|
||
disconnect conn1;
|
||
connect (conn2,localhost,mysqltest_3,,);
|
||
connection conn2;
|
||
use mysqltest_1;
|
||
update mysqltest_2.t1, mysqltest_2.t2 set c=500,d=600;
|
||
# the following failed before, should fail now.
|
||
--error 1142
|
||
update mysqltest_1.t1, mysqltest_1.t2 set a=100,b=200;
|
||
use mysqltest_2;
|
||
#the following used to succeed, it must fail now.
|
||
--error 1142
|
||
update mysqltest_1.t1, mysqltest_1.t2 set a=100,b=200;
|
||
--error 1142
|
||
update mysqltest_2.t1, mysqltest_1.t2 set c=100,b=200;
|
||
--error 1142
|
||
update mysqltest_1.t1, mysqltest_2.t2 set a=100,d=200;
|
||
#lets see the result
|
||
connection master;
|
||
select t1.*,t2.* from mysqltest_1.t1,mysqltest_1.t2;
|
||
select t1.*,t2.* from mysqltest_2.t1,mysqltest_2.t2;
|
||
|
||
delete from mysql.user where user='mysqltest_3';
|
||
delete from mysql.db where user="mysqltest_3";
|
||
delete from mysql.tables_priv where user="mysqltest_3";
|
||
delete from mysql.columns_priv where user="mysqltest_3";
|
||
flush privileges;
|
||
drop database mysqltest_1;
|
||
drop database mysqltest_2;
|
||
|
||
#
|
||
# just SHOW PRIVILEGES test
|
||
#
|
||
SHOW PRIVILEGES;
|