diff options
| author | Magnus Blåudd <magnus.blaudd@sun.com> | 2009-10-08 10:32:43 +0200 |
|---|---|---|
| committer | Magnus Blåudd <magnus.blaudd@sun.com> | 2009-10-08 10:32:43 +0200 |
| commit | d94752f42b6ed114f49904cf5305fe948f626d7a (patch) | |
| tree | 81688fb1dd3397f2d323c8773c40af7de11aa9dd /mysql-test | |
| parent | d003ddfdab06d53f256415247173112e57971c61 (diff) | |
| parent | 8ccd9d7cbeac34ffe5923b9c40ec8e5f6b34e03d (diff) | |
| download | mariadb-git-d94752f42b6ed114f49904cf5305fe948f626d7a.tar.gz | |
Merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/include/check-warnings.test | 2 | ||||
| -rw-r--r-- | mysql-test/include/mtr_warnings.sql | 2 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/mysql-test/include/check-warnings.test b/mysql-test/include/check-warnings.test index 5295dd51a85..41b0a98e43b 100644 --- a/mysql-test/include/check-warnings.test +++ b/mysql-test/include/check-warnings.test @@ -57,5 +57,5 @@ if (`select @result = 0`){ skip OK; } --enable_query_log -echo ^ Found warnings!!; +echo ^ Found warnings in $log_error; exit; diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql index d8aa6d3913f..f7d9d34f861 100644 --- a/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql @@ -209,7 +209,7 @@ BEGIN WHERE suspicious=1; IF @num_warnings > 0 THEN - SELECT file_name, line + SELECT line FROM error_log WHERE suspicious=1; --SELECT * FROM test_suppressions; -- Return 2 -> check failed diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 863863cece7..b3f1a89bd36 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1337,6 +1337,9 @@ sub command_line_setup { push(@valgrind_args, @default_valgrind_args) unless @valgrind_args; + # Make valgrind run in quiet mode so it only print errors + push(@valgrind_args, "--quiet" ); + mtr_report("Running valgrind with options \"", join(" ", @valgrind_args), "\""); } @@ -3652,7 +3655,7 @@ sub extract_warning_lines ($$) { # of patterns. For more info see BUG#42408 qr/^Warning:|mysqld: Warning|\[Warning\]/, qr/^Error:|\[ERROR\]/, - qr/^==.* at 0x/, + qr/^==\d*==/, # valgrind errors qr/InnoDB: Warning|InnoDB: Error/, qr/^safe_mutex:|allocated at line/, qr/missing DBUG_RETURN/, |