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 | |
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')
-rw-r--r-- | mysql-test/r/sp-error.result | 3 | ||||
-rw-r--r-- | mysql-test/t/dirty_close.test | 1 | ||||
-rw-r--r-- | mysql-test/t/sp-error.test | 6 |
3 files changed, 6 insertions, 4 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); diff --git a/mysql-test/t/dirty_close.test b/mysql-test/t/dirty_close.test index 17a729000e3..e49618170ab 100644 --- a/mysql-test/t/dirty_close.test +++ b/mysql-test/t/dirty_close.test @@ -1,3 +1,4 @@ +--source include/not_embedded.inc # Save the initial number of concurrent sessions --source include/count_sessions.inc 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; |