diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-03-02 12:39:32 +0100 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-03-02 12:39:32 +0100 |
| commit | 4760adbf3f8e283cb83912bc51d79d531787f0ba (patch) | |
| tree | f62023f003a7c2dfdcfb32ba67b6eef4be5fec68 /mysql-test/t/mysqltest.test | |
| parent | aa457a4aef6978e5621208d2b1d5240c8dd23c48 (diff) | |
| download | mariadb-git-4760adbf3f8e283cb83912bc51d79d531787f0ba.tar.gz | |
Bug #51590 mysqltest: --disable_abort_on_error does not work inside while/if
abort_on_error flag for stmt was set at initial parse
(Re)-set flag before execution instead, also added to test
Diffstat (limited to 'mysql-test/t/mysqltest.test')
| -rw-r--r-- | mysql-test/t/mysqltest.test | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index 25293ff29e7..b2d7c59a8a0 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -863,7 +863,7 @@ while ($outer) } # Test source in an if in a while which is false on 1st iteration -# Also test --error in same context +# Also test --error and --disable_abort_on_error in same context let $outer= 2; # Number of outer loops let $ifval= 0; # false 1st time while ($outer) @@ -874,6 +874,10 @@ while ($outer) --source $MYSQLTEST_VARDIR/tmp/sourced.inc --error ER_NO_SUCH_TABLE SELECT * from nowhere; + --disable_abort_on_error +# Statement giving a different error, to make sure we don't mask it + SELECT * FROM nowhere else; + --enable_abort_on_error } dec $outer; inc $ifval; |