Merge with 5.2

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|,