Commit d9e5cdd1 authored by Michael Widenius's avatar Michael Widenius

Automatic merge with 5.1

parents f4ed812e 5d269e46
......@@ -4460,7 +4460,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|InnoDB: Error: table 'test/bug39438'|,
qr|Access denied for user|,
qr|Aborted connection|,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment