Post-merge fixes for backports.

mysql-test/r/sp-error.result

@@ -1664,7 +1664,8 @@ set @old_recursion_depth = @@max_sp_recursion_depth;
 set @@max_sp_recursion_depth = 255;
 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|
 call p1(1);

mysql-test/t/dirty_close.test

+--source include/not_embedded.inc
 
 # Save the initial number of concurrent sessions
 --source include/count_sessions.inc

mysql-test/t/sp-error.test

@@ -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;