mirror of
https://github.com/MariaDB/server.git
synced 2025-05-29 21:42:28 +03:00
4e0bbc1b6e
In order to make multi-delete SP friendly we need to have all table locks for the elements of main statement table list properly set at the end of parsing. Also performed small cleanup: We don't need relink_tables_for_multidelete() any longer since the only case now when TABLE_LIST::correspondent_table is non-zero are tables in auxilary table list of multi-delete and these tables are handled specially in mysql_multi_delete_prepare(). mysql-test/r/sp-threads.result: Added test case for bug #11158 "Can't perform multi-delete in stored procedure". mysql-test/t/sp-threads.test: Added test case for bug #11158 "Can't perform multi-delete in stored procedure". sql/mysql_priv.h: - Removed third argument from the declaration of multi_delete_precheck() as nowdays we calculate number of tables in multi-delete from which we are going to delete rows right at the end of statement parsing. - Introduced definition of multi_delete_set_locks_and_link_aux_tables() which is responsible for propagation of proper table locks from multi-delete's auxilary table list to the main list and binding corresponding tables in these two lists. sql/sql_base.cc: Removed relink_tables_for_multidelete() routine and its invocations. We don't need them in 5.0 since the only case now when TABLE_LIST::correspondent_table is non-zero are tables in auxilary table list of multi-delete and these tables are handled specially in mysql_multi_delete_prepare(). sql/sql_lex.h: LEX::table_count Added description of new role of this LEX member for multi-delete. Now for this statement we store number of tables from which we should delete records there. sql/sql_parse.cc: multi_delete_precheck(): Moved code which is responsible for iterating through auxilary table list and binding its elements with corresponding elements of main table list, and properly updating locks in it to separate function - multi_delete_set_locks_and_link_aux_tables(). This is because in order to make multi-delete SP friendly we need to have all locks set properly at the end of statement parsing. So we are introducing new function which will be called from parser. We also calculate number of tables from which we are going to perform deletions there and store this number for later usage in LEX::table_count. Also removed some no longer needed code. sql/sql_prepare.cc: mysql_test_multidelete(): Now multi_delete_precheck() takes only two arguments, so we don't need to pass fake third parameter. sql/sql_yacc.yy: delete: In order to make multi-delete SP friendly we need to have all table locks for the elements of main statement table list properly set at the end of parsing.
122 lines
2.3 KiB
Plaintext
122 lines
2.3 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#NNNN: New bug synopsis
|
|
#
|
|
#--disable_warnings
|
|
#drop procedure if exists bugNNNN;
|
|
#--enable_warnings
|
|
#create procedure bugNNNN...
|
|
|