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/r | |
| 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/r')
| -rw-r--r-- | mysql-test/r/sp-error.result | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/r/sp-error.result b/mysql-test/r/sp-error.result index 50b641e8052..c435e6a7fd4 100644 --- a/mysql-test/r/sp-error.result +++ b/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); |