mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
8272be9412
Fix bug in SHOW GRANTS when there is a column privilege but no table privilege include/mysql.h: Make server_inited external libmysqld/libmysqld.c: Remove reference to (wrong) external variable mysql-test/r/grant.result: Fixed up grant test to not user 'user1' or 'user2' Check for bug in SHOW GRANTS when there is a column privilege but no table privilege mysql-test/r/mix_innodb_myisam_binlog.result: Change to use tables t1 and t2 mysql-test/t/grant.test: Fixed up grant test to not user 'user1' or 'user2' Check for bug in SHOW GRANTS when there is a column privilege but no table privilege mysql-test/t/mix_innodb_myisam_binlog.test: Change to use tables t1 and t2 sql/sql_acl.cc: Fix bug in SHOW GRANTS when there is a column privilege but no table privilege sql/sql_parse.cc: Use HAVE_REPLICATION instead of EMBEDDED_LIBRARY
91 lines
3.8 KiB
Text
91 lines
3.8 KiB
Text
--disable_warnings
|
|
drop table if exists t1;
|
|
--enable_warnings
|
|
|
|
#
|
|
# 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;
|
|
|
|
#
|
|
# 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
|