Commit 8a422a14 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/home/dlenev/src/mysql-5.0-bg9565
parents ba7d8ad7 32e157ec

mysql-test/r/sp.result

+17 −0
Original line number Diff line number Diff line
@@ -3062,4 +3062,21 @@ l 
drop procedure bug6063|

drop procedure bug7088_1|

drop procedure bug7088_2|

drop procedure if exists bug9565_sub|

drop procedure if exists bug9565|

create procedure bug9565_sub()

begin

select * from t1;

end|

create procedure bug9565()

begin

insert into t1 values ("one", 1);

call bug9565_sub();

end|

call bug9565()|

id	data

one	1

delete from t1|

drop procedure bug9565_sub|

drop procedure bug9565|

drop table t1,t2;

mysql-test/t/sp.test

+22 −0
Original line number Diff line number Diff line
@@ -3832,6 +3832,28 @@ drop procedure bug6063| 
drop procedure bug7088_1|

drop procedure bug7088_2|



#

# BUG#9565: "Wrong locking in stored procedure if a sub-sequent procedure

#           is called".

#

--disable_warnings

drop procedure if exists bug9565_sub|

drop procedure if exists bug9565|

--enable_warnings

create procedure bug9565_sub()

begin

  select * from t1;

end|

create procedure bug9565()

begin

  insert into t1 values ("one", 1);

  call bug9565_sub();

end|

call bug9565()|

delete from t1|

drop procedure bug9565_sub|

drop procedure bug9565|





#

# BUG#NNNN: New bug synopsis