mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 06:44:16 +01:00
7a37eeae62
should work in Prepared Statements. Post-review changeset.
Problem: There are some commands which are avaiable to be executed in SP
but cannot be prepared. This patch fixes this and makes it possible
prepare these statements.
Changes: The commands later are made available in PS. RESET has been forbidden
in SF/Trigger.
Solution: All current server commands where checked and those missing (see later)
we added. Tests for all of the commands with repeated executions were
added - testing with SP, SF and PS.
SHOW BINLOG EVENTS
SHOW (MASTER | SLAVE) STATUS
SHOW (MASTER | BINARY) LOGS
SHOW (PROCEDURE | FUNCTION) CODE (parsable only in debug builds)
SHOW CREATE (PROCEDURE | FUNCTION | EVENT | TABLE | VIEW)
SHOW (AUTHORS | CONTRIBUTORS | WARNINGS | ERRORS)
CHANGE MASTER
RESET (MASTER | SLAVE | QUERY CACHE)
SLAVE (START | STOP)
CHECKSUM (TABLE | TABLES)
INSTALL PLUGIN
UNINSTALL PLUGIN
CACHE INDEX
LOAD INDEX INTO CACHE
GRANT
REVOKE
KILL
(CREATE | RENAME | DROP) DATABASE
(CREATE | RENAME | DROP) USER
FLUSH (TABLE | TABLES | TABLES WITH READ LOCK | HOSTS | PRIVILEGES |
LOGS | STATUS | MASTER | SLAVE | DES_KEY_FILE | USER_RESOURCES)
mysql-test/r/ps.result:
update result
mysql-test/r/ps_1general.result:
update result
mysql-test/r/ps_grant.result:
update result
mysql-test/r/sp-dynamic.result:
update result
mysql-test/t/ps.test:
Add more statements, probably all currently missing which are possible in
a SP but not preparable.
Every statement is tested in a SP, in a SF and attempted to prepare.
mysql-test/t/ps_1general.test:
- Enable some of the statements, which are already possible in SP.
- 1295 -> ER_UNSUPPORTED_PS
mysql-test/t/ps_grant.test:
Enable statements already possible in SP.
sql/sp_head.cc:
- Reorder to keep some alphabet order.
- Add missing SHOW_SCHEDULER_STATUS.
sql/sql_prepare.cc:
Add possibility to prepare statements, which are already allowed in SP.
128 lines
3.9 KiB
Text
128 lines
3.9 KiB
Text
# Can't test grants with embedded server
|
|
-- source include/not_embedded.inc
|
|
|
|
let $type= 'MYISAM' ;
|
|
|
|
################ GRANT/REVOKE/DROP affecting a parallel session ################
|
|
--disable_query_log
|
|
select '------ grant/revoke/drop affects a parallel session test ------'
|
|
as test_sequence ;
|
|
--enable_query_log
|
|
|
|
#---------------------------------------------------------------------#
|
|
# Here we test that:
|
|
# 1. A new GRANT will be visible within another sessions. #
|
|
# #
|
|
# Let's assume there is a parallel session with an already prepared #
|
|
# statement for a table. #
|
|
# A DROP TABLE will affect the EXECUTE properties. #
|
|
# A REVOKE will affect the EXECUTE properties. #
|
|
#---------------------------------------------------------------------#
|
|
|
|
# Who am I ?
|
|
# this is different across different systems:
|
|
# select current_user(), user() ;
|
|
|
|
#### create a new user account ####
|
|
## There should be no grants for that non existing user
|
|
--error 1141
|
|
show grants for second_user@localhost ;
|
|
## create a new user account by using GRANT statements on t9
|
|
create database mysqltest;
|
|
# create the tables (t1 and t9) used in many tests
|
|
use mysqltest;
|
|
--disable_query_log
|
|
--source include/ps_create.inc
|
|
--source include/ps_renew.inc
|
|
--enable_query_log
|
|
eval use $DB;
|
|
grant usage on mysqltest.* to second_user@localhost
|
|
identified by 'looser' ;
|
|
grant select on mysqltest.t9 to second_user@localhost
|
|
identified by 'looser' ;
|
|
show grants for second_user@localhost ;
|
|
|
|
|
|
#### establish a second session to the new user account
|
|
connect (con3,localhost,second_user,looser,mysqltest);
|
|
## switch to the second session
|
|
connection con3;
|
|
# Who am I ?
|
|
select current_user();
|
|
## check the access rights
|
|
show grants for current_user();
|
|
prepare s_t9 from 'select c1 as my_col
|
|
from t9 where c1= 1' ;
|
|
execute s_t9 ;
|
|
# check that we cannot do a SELECT on the table t1;
|
|
--error 1142
|
|
select a as my_col from t1;
|
|
|
|
|
|
#### give access rights to t1 and drop table t9
|
|
## switch back to the first session
|
|
connection default;
|
|
grant select on mysqltest.t1 to second_user@localhost
|
|
identified by 'looser' ;
|
|
show grants for second_user@localhost ;
|
|
drop table mysqltest.t9 ;
|
|
show grants for second_user@localhost ;
|
|
|
|
|
|
#### check the access as new user
|
|
## switch to the second session
|
|
connection con3;
|
|
######## Question 1: The table t1 should be now accessible. ########
|
|
show grants for second_user@localhost ;
|
|
prepare s_t1 from 'select a as my_col from t1' ;
|
|
execute s_t1 ;
|
|
######## Question 2: The table t9 does not exist. ########
|
|
--error 1146
|
|
execute s_t9 ;
|
|
deallocate prepare s_t9;
|
|
|
|
|
|
#### revoke the access rights to t1
|
|
## switch back to the first session
|
|
connection default;
|
|
revoke all privileges on mysqltest.t1 from second_user@localhost
|
|
identified by 'looser' ;
|
|
show grants for second_user@localhost ;
|
|
|
|
#### check the access as new user
|
|
## switch to the second session
|
|
connection con3;
|
|
show grants for second_user@localhost ;
|
|
######## Question 2: The table t1 should be now not accessible. ########
|
|
--error 1142
|
|
execute s_t1 ;
|
|
|
|
## cleanup
|
|
## switch back to the first session
|
|
connection default;
|
|
## disconnect the second session
|
|
disconnect con3 ;
|
|
## remove all rights of second_user@localhost
|
|
revoke all privileges, grant option from second_user@localhost ;
|
|
show grants for second_user@localhost ;
|
|
drop user second_user@localhost ;
|
|
commit ;
|
|
--error 1141
|
|
show grants for second_user@localhost ;
|
|
|
|
drop database mysqltest;
|
|
|
|
# End of 4.1 tests
|
|
|
|
#
|
|
# grant/revoke + drop user
|
|
#
|
|
prepare stmt3 from ' grant all on test.t1 to drop_user@localhost
|
|
identified by ''looser'' ';
|
|
grant all on test.t1 to drop_user@localhost
|
|
identified by 'looser' ;
|
|
prepare stmt3 from ' revoke all privileges on test.t1 from
|
|
drop_user@localhost ';
|
|
revoke all privileges on test.t1 from drop_user@localhost ;
|
|
prepare stmt3 from ' drop user drop_user@localhost ';
|
|
drop user drop_user@localhost;
|