mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Post-merge fixes for backports.
mysql-test/r/sp-error.result: Update test case result. mysql-test/t/dirty_close.test: Dirty close does not work under embedded. mysql-test/t/sp-error.test: Use the specific error number so it won't catch other non-fatal errors.
This commit is contained in:
@@ -2419,7 +2419,6 @@ end$$
|
||||
|
||||
delimiter ;$$
|
||||
|
||||
|
||||
#
|
||||
# Bug#15192: "fatal errors" are caught by handlers in stored procedures
|
||||
#
|
||||
@@ -2432,11 +2431,12 @@ set @@max_sp_recursion_depth = 255;
|
||||
delimiter |;
|
||||
create procedure p1(a int)
|
||||
begin
|
||||
declare continue handler for sqlexception select 'exception';
|
||||
declare continue handler for 1436 -- ER_STACK_OVERRUN_NEED_MORE
|
||||
select 'exception';
|
||||
call p1(a+1);
|
||||
end|
|
||||
delimiter ;|
|
||||
--error 0,ER_STACK_OVERRUN_NEED_MORE
|
||||
--error 0,ER_STACK_OVERRUN_NEED_MORE,ER_SP_RECURSION_LIMIT
|
||||
call p1(1);
|
||||
set @@max_sp_recursion_depth = @old_recursion_depth;
|
||||
drop procedure p1;
|
||||
|
||||
Reference in New Issue
Block a user