diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-06-01 16:01:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-06-01 16:01:42 +0200 |
| commit | d60257454213ac465c94b441fca477524b7dee82 (patch) | |
| tree | ad70bab4615f135e1fb504f321896fc24b85db06 /mysql-test | |
| parent | fce4ab0ab405e112035bda98176c5834200d26df (diff) | |
| parent | 528378920b803efd7ba4d3f54fc998cfa8a5c5c9 (diff) | |
| download | mariadb-git-d60257454213ac465c94b441fca477524b7dee82.tar.gz | |
Merge remote-tracking branch 'github/10.1' into 10.1
Diffstat (limited to 'mysql-test')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index fdc0833cc97..4bf54171759 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -4372,6 +4372,8 @@ sub extract_warning_lines ($$) { qr/InnoDB: Warning: a long semaphore wait:/, qr/InnoDB: Disabling redo log encryption/, qr/InnoDB: Redo log crypto: Can't initialize to key version -1u/, + qr/InnoDB: Dumping buffer pool.*/, + qr/InnoDB: Buffer pool.*/, qr/Slave: Unknown table 't1' .* 1051/, qr/Slave SQL:.*(Internal MariaDB error code: [[:digit:]]+|Query:.*)/, qr/slave SQL thread aborted/, |