mirror of
https://github.com/MariaDB/server.git
synced 2025-05-05 16:59:35 +03:00
11f9e513d7
of stored routines definitions even if we already have some tables open and locked. To avoid deadlocks in this case we have to put certain restrictions on locking of mysql.proc table. This allows to use stored routines safely under LOCK TABLES without explicitly mentioning mysql.proc in the list of locked tables. It also fixes bug #11554 "Server crashes on statement indirectly using non-cached function". mysql-test/r/sp-error.result: Added test which checks that now we can read stored routines definitions under LOCK TABLES even if we have not locked mysql.proc explicitly. Also added check for restrictions which this ability puts on mysql.proc locking. Updated test for bug #9566 to correspond this new situation. mysql-test/r/sp-threads.result: Added test for bug #11554 "Server crashes on statement indirectly using non-cached function". mysql-test/t/sp-error.test: Added test which checks that now we can read stored routines definitions under LOCK TABLES even if we have not locked mysql.proc explicitly. Also added check for restrictions which this ability puts on mysql.proc locking. Updated test for bug #9566 to correspond this new situation. mysql-test/t/sp-threads.test: Added test for bug #11554 "Server crashes on statement indirectly using non-cached function". sql/lock.cc: get_lock_data(): To be able to open and lock for reading system tables like 'mysql.proc', when we already have some tables opened and locked, and avoid deadlocks we have to disallow write-locking of these tables with any other tables. sql/mysql_priv.h: open_table() has new parameter which allows to open table even if some-one has done a flush or holding namelock on it. sql/share/errmsg.txt: Added error message saying that one cannot write-lock some of system tables with any other tables. sql/sp.cc: open_proc_table_for_read()/close_proc_table(): Added functions to be able open and close mysql.proc table when we already have some tables open and locked. open_proc_table_for_update(): Added function to simplify opening of mysql.proc for updates. db_find_routine_aux()/db_find_routine()/db_update_routine()/... Moved responsibility for opening mysql.proc table from db_find_routine_aux() one level up, since this level knows better which type of table access for reading of for update it needs. sp_function_exists(): Removed unused function. sql/sp.h: sp_function_exists(): Removed unused function. sql/sql_base.cc: open_table(): Added new parameter which allows to open table even if some-one has done a flush or holding namelock on it. open_unireg_entry(): Mark 'mysql.proc' as a system table which has special restrictions on its locking, but thanks to them can be open and locked even if we already have some open and locked. sql/sql_class.cc: Moved THD members holding information about open and locked tables to separate Open_tables_state class to be able to save/restore this state easier. Added THD::push_open_tables_state()/pop_open_tables_state() methods for saving/restoring this state. sql/sql_class.h: Moved THD members holding information about open and locked tables to separate Open_tables_state class to be able to save/restore this state easier. Added THD::push_open_tables_state()/pop_open_tables_state() methods for saving/restoring this state. sql/sql_lex.cc: Removed LEX::proc_table member which was not really used. sql/sql_lex.h: Removed LEX::proc_table member which was not really used. sql/sql_table.cc: open_table() has new parameter which allows to open table even if some-one has done a flush or holding namelock on it. sql/table.h: Added TABLE_SHARE::system_table indicating that this table is system table like 'mysql.proc' and we want to be able to open and read-lock it even when we already have some tables open and locked (and because of this we have to put some restrictions on write locking it).
141 lines
2.8 KiB
Plaintext
141 lines
2.8 KiB
Plaintext
#
|
|
# Testing stored procedures with multiple connections,
|
|
# except security/privilege tests, they go to sp-security.test
|
|
#
|
|
|
|
connect (con1root,localhost,root,,);
|
|
connect (con2root,localhost,root,,);
|
|
|
|
connection con1root;
|
|
use test;
|
|
|
|
--disable_warnings
|
|
drop table if exists t1;
|
|
--enable_warnings
|
|
create table t1 (s1 int, s2 int, s3 int);
|
|
|
|
delimiter //;
|
|
create procedure bug4934()
|
|
begin
|
|
insert into t1 values (1,0,1);
|
|
end//
|
|
delimiter ;//
|
|
|
|
|
|
connection con2root;
|
|
use test;
|
|
|
|
call bug4934();
|
|
select * from t1;
|
|
|
|
|
|
connection con1root;
|
|
|
|
drop table t1;
|
|
create table t1 (s1 int, s2 int, s3 int);
|
|
|
|
drop procedure bug4934;
|
|
delimiter //;
|
|
create procedure bug4934()
|
|
begin
|
|
end//
|
|
delimiter ;//
|
|
|
|
|
|
connection con2root;
|
|
|
|
select * from t1;
|
|
call bug4934();
|
|
select * from t1;
|
|
|
|
connection con1root;
|
|
|
|
drop table t1;
|
|
drop procedure bug4934;
|
|
|
|
|
|
#
|
|
# BUG #9486 "Can't perform multi-update in stored procedure"
|
|
#
|
|
--disable_warnings
|
|
drop procedure if exists bug9486;
|
|
drop table if exists t1, t2;
|
|
--enable_warnings
|
|
create table t1 (id1 int, val int);
|
|
create table t2 (id2 int);
|
|
|
|
create procedure bug9486()
|
|
update t1, t2 set val= 1 where id1=id2;
|
|
call bug9486();
|
|
# Let us check that SP invocation requires write lock for t2.
|
|
connection con2root;
|
|
lock tables t2 write;
|
|
connection con1root;
|
|
send call bug9486();
|
|
connection con2root;
|
|
--sleep 2
|
|
# There should be call statement in locked state.
|
|
--replace_column 1 # 6 #
|
|
show processlist;
|
|
unlock tables;
|
|
connection con1root;
|
|
reap;
|
|
|
|
drop procedure bug9486;
|
|
drop table t1, t2;
|
|
|
|
#
|
|
# BUG#11158: Can't perform multi-delete in stored procedure
|
|
#
|
|
--disable_warnings
|
|
drop procedure if exists bug11158;
|
|
--enable_warnings
|
|
create procedure bug11158() delete t1 from t1, t2 where t1.id = t2.id;
|
|
create table t1 (id int, j int);
|
|
insert into t1 values (1, 1), (2, 2);
|
|
create table t2 (id int);
|
|
insert into t2 values (1);
|
|
# Procedure should work and cause proper effect (delete only first row)
|
|
call bug11158();
|
|
select * from t1;
|
|
# Also let us test that we obtain only read (and thus non exclusive) lock
|
|
# for table from which we are not going to delete rows.
|
|
connection con2root;
|
|
lock tables t2 read;
|
|
connection con1root;
|
|
call bug11158();
|
|
connection con2root;
|
|
unlock tables;
|
|
connection con1root;
|
|
# Clean-up
|
|
drop procedure bug11158;
|
|
drop table t1, t2;
|
|
|
|
#
|
|
# BUG#11554: Server crashes on statement indirectly using non-cached function
|
|
#
|
|
--disable_warnings
|
|
drop function if exists bug11554;
|
|
drop view if exists v1;
|
|
--enable_warnings
|
|
create table t1 (i int);
|
|
create function bug11554 () returns int return 1;
|
|
create view v1 as select bug11554() as f;
|
|
connection con2root;
|
|
# This should not crash server
|
|
insert into t1 (select f from v1);
|
|
# Clean-up
|
|
connection con1root;
|
|
drop function bug11554;
|
|
drop table t1;
|
|
drop view v1;
|
|
|
|
#
|
|
# BUG#NNNN: New bug synopsis
|
|
#
|
|
#--disable_warnings
|
|
#drop procedure if exists bugNNNN;
|
|
#--enable_warnings
|
|
#create procedure bugNNNN...
|
|
|