[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2778)

#At lp:maria 2778 knielsen@knielsen-hq.org 2009-11-30 After-merge fixes for MySQL 5.1.41 merge into MariaDB: Another warning also needed during shutdown. modified: mysql-test/mysql-test-run.pl === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2009-11-27 13:20:59 +0000 +++ b/mysql-test/mysql-test-run.pl 2009-11-30 13:24:30 +0000 @@ -3999,6 +3999,7 @@ sub extract_warning_lines ($) { qr/Slave I\/O: Get master COLLATION_SERVER failed with error:.*/, qr/Slave I\/O: Get master TIME_ZONE failed with error:.*/, qr/Slave I\/O: error reconnecting to master '.*' - retry-time: [1-3] retries/, + qr/Error reading packet/, ); my $match_count= 0;