diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-02-21 18:00:23 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-02-21 18:00:23 +0200 |
| commit | f93da174c514e001fd0af61bc4fba51f9f8e7c9e (patch) | |
| tree | baaec7165aa887925062c2b4682405157ea1ae2b | |
| parent | 6fbeed067b25a07542dd989b7a816969615d7df6 (diff) | |
| parent | 86eebf33e3383aa5c59fb93473e64a202bc0badb (diff) | |
| download | mariadb-git-f93da174c514e001fd0af61bc4fba51f9f8e7c9e.tar.gz | |
Merge with 5.2
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index bfdcb678573..4d6269044c1 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -4474,7 +4474,7 @@ sub extract_warning_lines ($$) { qr/Slave: Operation DROP USER failed for 'create_rout_db'/, qr|Checking table: '\..mtr.test_suppressions'|, qr|Table \./test/bug53592 has a primary key in InnoDB data dictionary, but not in MySQL|, - qr|mysqld: Table '\..mtr.test_suppressions' is marked as crashed and should be repaired|, + qr|Table '\..mtr.test_suppressions' is marked as crashed and should be repaired|, qr|Can't open shared library.*ha_archive|, qr|InnoDB: Error: table 'test/bug39438'|, qr|Access denied for user|, |