summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.pl
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-12-27 21:17:16 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-12-27 21:17:16 +0200
commit8cc15c036dbc5fefb025eb957f4d312d41659163 (patch)
tree6c4d67d677e6bb9bc90b7e3f08d18c8a798680b6 /mysql-test/mysql-test-run.pl
parentcc28947315887f55814cb8bc4e68d4e2fe6c65e6 (diff)
parentb86e0f25f896285a34c999515ad50e50d879f3e7 (diff)
downloadmariadb-git-8cc15c036dbc5fefb025eb957f4d312d41659163.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-xmysql-test/mysql-test-run.pl2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index f405d026e78..3c4c6f80940 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -4675,6 +4675,8 @@ sub extract_warning_lines ($$) {
qr/missing DBUG_RETURN/,
qr/Attempting backtrace/,
qr/Assertion .* failed/,
+ qr/Sanitizer/,
+ qr/runtime error:/,
);
# These are taken from the include/mtr_warnings.sql global suppression
# list. They occur delayed, so they can be parsed during shutdown rather