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

Post-merge fixes for backports.

Browse Source
This commit is contained in:
Davi Arnaut 2009-11-13 10:56:38 -02:00
parent 01553c2920
commit 9e27ce3250
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/sp-error.result
View File

@ -1664,7 +1664,8 @@ set @old_recursion_depth = @@max_sp_recursion_depth;
set @@max_sp_recursion_depth = 255; set @@max_sp_recursion_depth = 255;
create procedure p1(a int) create procedure p1(a int)
begin begin
declare continue handler for sqlexception select 'exception'; declare continue handler for 1436 -- ER_STACK_OVERRUN_NEED_MORE
select 'exception';
call p1(a+1); call p1(a+1);
end| end|
call p1(1); call p1(1);

1
mysql-test/t/dirty_close.test
View File

@ -1,3 +1,4 @@
--source include/not_embedded.inc
# Save the initial number of concurrent sessions # Save the initial number of concurrent sessions
--source include/count_sessions.inc --source include/count_sessions.inc

6
mysql-test/t/sp-error.test
View File

@ -2419,7 +2419,6 @@ end$$
delimiter ;$$ delimiter ;$$
# #
# Bug#15192: "fatal errors" are caught by handlers in stored procedures # Bug#15192: "fatal errors" are caught by handlers in stored procedures
# #
@ -2432,11 +2431,12 @@ set @@max_sp_recursion_depth = 255;
delimiter |; delimiter |;
create procedure p1(a int) create procedure p1(a int)
begin begin
declare continue handler for sqlexception select 'exception'; declare continue handler for 1436 -- ER_STACK_OVERRUN_NEED_MORE
select 'exception';
call p1(a+1); call p1(a+1);
end| end|
delimiter ;| delimiter ;|
--error 0,ER_STACK_OVERRUN_NEED_MORE --error 0,ER_STACK_OVERRUN_NEED_MORE,ER_SP_RECURSION_LIMIT
call p1(1); call p1(1);
set @@max_sp_recursion_depth = @old_recursion_depth; set @@max_sp_recursion_depth = @old_recursion_depth;
drop procedure p1; drop procedure p1;