diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-12-05 12:33:02 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-12-05 12:33:02 -0500 |
| commit | 3bb02f3e6d70687b02c6902fd6478e8c328608f8 (patch) | |
| tree | 7962068cae78450246a484cf95cbe5cf2e37382a /mysql-test/mysql-test-run.pl | |
| parent | a4cdd20d49a5a6ca0eb7346b7b9e898ac5e7995b (diff) | |
| parent | ffc0ef63164e9a121d8a02323afe32a82299171e (diff) | |
| download | mariadb-git-3bb02f3e6d70687b02c6902fd6478e8c328608f8.tar.gz | |
bzr merge -rtag:mariadb-10.0.15 maria/10.0
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index e0c5c8663fb..befdf3a3ffd 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -333,7 +333,7 @@ sub testcase_timeout ($) { return $opt_testcase_timeout * 60; } -sub check_timeout ($) { return testcase_timeout($_[0]) / 10; } +sub check_timeout ($) { return testcase_timeout($_[0]); } our $opt_warnings= 1; @@ -4881,6 +4881,8 @@ sub extract_warning_lines ($$) { qr|Plugin 'FEEDBACK' registration as a INFORMATION SCHEMA failed|, qr|'log-bin-use-v1-row-events' is MySQL 5.6 compatible option|, qr|InnoDB: Setting thread \d+ nice to \d+ failed, current nice \d+, errno 13|, # setpriority() fails under valgrind + qr|Failed to setup SSL|, + qr|SSL error: Failed to set ciphers to use|, # Galera-related warnings. qr|WSREP:.*down context.*|, qr|WSREP: Failed to send state UUID:.*|, |