1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enable test cases for Bug#6063 and Bug#7088.

Browse Source
This commit is contained in:
Magne Mahre 2009-11-20 14:10:20 +01:00
parent ecb6228c62
commit 2564b5046d
2 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mysql-test/r/sp.result
View File

@ -3321,9 +3321,43 @@ call bug11529()|
call bug11529()| call bug11529()|
delete from t1| delete from t1|
drop procedure bug11529| drop procedure bug11529|
set character set utf8|
drop procedure if exists bug6063| drop procedure if exists bug6063|
drop procedure if exists bug7088_1| drop procedure if exists bug7088_1|
drop procedure if exists bug7088_2| drop procedure if exists bug7088_2|
create procedure bug6063()
begin
lâbel: begin end;
label: begin end;
label1: begin end;
end|
create procedure bug7088_1()
label1: begin end label1|
create procedure bug7088_2()
läbel1: begin end|
call bug6063()|
call bug7088_1()|
call bug7088_2()|
set character set default|
show create procedure bug6063|
Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation
bug6063 CREATE DEFINER=`root`@`localhost` PROCEDURE `bug6063`()
begin
lâbel: begin end;
label: begin end;
label1: begin end;
end utf8 latin1_swedish_ci latin1_swedish_ci
show create procedure bug7088_1|
Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation
bug7088_1 CREATE DEFINER=`root`@`localhost` PROCEDURE `bug7088_1`()
label1: begin end label1 utf8 latin1_swedish_ci latin1_swedish_ci
show create procedure bug7088_2|
Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation
bug7088_2 CREATE DEFINER=`root`@`localhost` PROCEDURE `bug7088_2`()
läbel1: begin end utf8 latin1_swedish_ci latin1_swedish_ci
drop procedure bug6063|
drop procedure bug7088_1|
drop procedure bug7088_2|
drop procedure if exists bug9565_sub| drop procedure if exists bug9565_sub|
drop procedure if exists bug9565| drop procedure if exists bug9565|
create procedure bug9565_sub() create procedure bug9565_sub()

21
mysql-test/t/sp.test
View File

@ -4061,34 +4061,41 @@ drop procedure bug11529|
# BUG#6063: Stored procedure labels are subject to restrictions (partial) # BUG#6063: Stored procedure labels are subject to restrictions (partial)
# BUG#7088: Stored procedures: labels won't work if character set is utf8 # BUG#7088: Stored procedures: labels won't work if character set is utf8
# #
set character set utf8|
--disable_warnings --disable_warnings
drop procedure if exists bug6063| drop procedure if exists bug6063|
drop procedure if exists bug7088_1| drop procedure if exists bug7088_1|
drop procedure if exists bug7088_2| drop procedure if exists bug7088_2|
--enable_warnings --enable_warnings
--disable_parsing # temporarily disabled until Bar fixes BUG#11986
create procedure bug6063() create procedure bug6063()
lâbel: begin end| begin
call bug6063()| lâbel: begin end;
# QQ Known bug: this will not show the label correctly. label: begin end;
show create procedure bug6063| label1: begin end;
end|
set character set utf8|
create procedure bug7088_1() create procedure bug7088_1()
label1: begin end label1| label1: begin end label1|
create procedure bug7088_2() create procedure bug7088_2()
läbel1: begin end| läbel1: begin end|
call bug6063()|
call bug7088_1()| call bug7088_1()|
call bug7088_2()| call bug7088_2()|
set character set default| set character set default|
show create procedure bug6063|
show create procedure bug7088_1| show create procedure bug7088_1|
show create procedure bug7088_2| show create procedure bug7088_2|
drop procedure bug6063| drop procedure bug6063|
drop procedure bug7088_1| drop procedure bug7088_1|
drop procedure bug7088_2| drop procedure bug7088_2|
--enable_parsing
# #
# BUG#9565: "Wrong locking in stored procedure if a sub-sequent procedure # BUG#9565: "Wrong locking in stored procedure if a sub-sequent procedure