diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-11-13 10:56:38 -0200 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-11-13 10:56:38 -0200 |
| commit | 5128b54c38ae183d18a29e00b318c22046445715 (patch) | |
| tree | 64ffd82cfafe4a64f733aeb39a269030e4a9e50e /mysql-test/t/sp-error.test | |
| parent | 827cbd2bb52c9ad95f3fdecff2a58126ca57cd85 (diff) | |
| download | mariadb-git-5128b54c38ae183d18a29e00b318c22046445715.tar.gz | |
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.
Diffstat (limited to 'mysql-test/t/sp-error.test')
| -rw-r--r-- | mysql-test/t/sp-error.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/sp-error.test b/mysql-test/t/sp-error.test index 574002d3d38..5dd4ea80ed0 100644 --- a/mysql-test/t/sp-error.test +++ b/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; |