diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-11-04 16:53:10 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-11-04 16:53:10 +0200 |
| commit | 3797ca41b39c862cf4733eadea8c91ed138ca1a4 (patch) | |
| tree | ec51a2bcd2a7c071f89d3177ca7914dccd111c9f /mysql-test/mysql-test-run.pl | |
| parent | 5789f96c624d00aeef137602ab0c4828620748e8 (diff) | |
| parent | 3bac9cf7fe12c1b1c644ac7963c701b79b3127f3 (diff) | |
| download | mariadb-git-3797ca41b39c862cf4733eadea8c91ed138ca1a4.tar.gz | |
Automatic merge with 5.1
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 2eb32c33954..41501da6088 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -4281,6 +4281,7 @@ sub extract_warning_lines ($) { qr/Slave SQL thread retried transaction/, qr/Slave \(additional info\)/, qr/Incorrect information in file/, + qr/Incorrect key file for table .*crashed.*/, qr/Slave I\/O: Get master SERVER_ID failed with error:.*/, qr/Slave I\/O: Get master clock failed with error:.*/, qr/Slave I\/O: Get master COLLATION_SERVER failed with error:.*/, |