bk commit into 6.0 tree (davi:1.2641)

[Davi Arnaut]

Below is the list of changes that have just been committed into a local
6.0 repository of davi.  When davi does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-04-14 20:28:17-03:00, davi@stripped +2 -0
  Post-merge test case fix for bug 15192

  mysql-test/r/sp-error.result@stripped, 2008-04-14 20:28:13-03:00, davi@stripped +2 -1
    Update test case result.

  mysql-test/t/sp-error.test@stripped, 2008-04-14 20:28:13-03:00, davi@stripped +3 -2
    Use the specific error number so it won't catch
    other non-fatal errors.

diff -Nrup a/mysql-test/r/sp-error.result b/mysql-test/r/sp-error.result
--- a/mysql-test/r/sp-error.result	2008-04-14 07:09:57 -03:00
+++ b/mysql-test/r/sp-error.result	2008-04-14 20:28:13 -03:00
@@ -1628,7 +1628,8 @@ set @old_recursion_depth = @@max_sp_recu
 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);
diff -Nrup a/mysql-test/t/sp-error.test b/mysql-test/t/sp-error.test
--- a/mysql-test/t/sp-error.test	2008-04-14 07:09:57 -03:00
+++ b/mysql-test/t/sp-error.test	2008-04-14 20:28:13 -03:00
@@ -2409,11 +2409,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;