diff options
author | Sergei Golubchik <sergii@pisem.net> | 2014-02-05 17:27:32 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-05 17:27:32 +0100 |
commit | b25951cc5e80961beb5bf11028b8a00e94e64372 (patch) | |
tree | a608087938981e8ca4a49158a44887efde8f1996 | |
parent | 2ab48b44dafb4175f52fa22a18f3612dce5d0379 (diff) | |
download | mariadb-git-b25951cc5e80961beb5bf11028b8a00e94e64372.tar.gz |
fix the test to be independent from the stack size
-rw-r--r-- | mysql-test/r/not_embedded_server.result | 1 | ||||
-rw-r--r-- | mysql-test/t/not_embedded_server.test | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/r/not_embedded_server.result b/mysql-test/r/not_embedded_server.result index eccf6151d33..33c8bfdb5d6 100644 --- a/mysql-test/r/not_embedded_server.result +++ b/mysql-test/r/not_embedded_server.result @@ -6,6 +6,7 @@ slave_skip_errors OFF # Bug#58026: massive recursion and crash in regular expression handling # SELECT '1' RLIKE RPAD('1', 10000, '('); +Got one of the listed errors # # WL#4284: Transactional DDL locking # diff --git a/mysql-test/t/not_embedded_server.test b/mysql-test/t/not_embedded_server.test index 5b99c37ee29..0878a78b885 100644 --- a/mysql-test/t/not_embedded_server.test +++ b/mysql-test/t/not_embedded_server.test @@ -18,10 +18,8 @@ SHOW VARIABLES like 'slave_skip_errors'; --echo # Bug#58026: massive recursion and crash in regular expression handling --echo # ---disable_result_log ---error ER_STACK_OVERRUN_NEED_MORE +--error ER_STACK_OVERRUN_NEED_MORE,ER_REGEXP_ERROR SELECT '1' RLIKE RPAD('1', 10000, '('); ---enable_result_log # End of 5.1 tests |