#At lp:maria 2776 knielsen@knielsen-hq.org 2009-11-27 After-merge fixes for MySQL 5.1.41 merge into MariaDB: more fixes for Buildbot problems. modified: mysql-test/mysql-test-run.pl mysql-test/suite/rpl/r/rpl_temporary_errors.result mysql-test/suite/rpl/t/rpl_temporary_errors.test sql/sql_select.cc per-file messages: mysql-test/mysql-test-run.pl Manually apply similar patch to the one in Bug#47983. mysql-test/suite/rpl/r/rpl_temporary_errors.result Fix wrong failure with warning in error log due to per-test suppressions not being active during server shutdown. mysql-test/suite/rpl/t/rpl_temporary_errors.test Fix wrong failure with warning in error log due to per-test suppressions not being active during server shutdown. sql/sql_select.cc Manually cherry-pick fix for Bug#45989. For some reason, that fix was reverted in MySQL 5.1, even though it is necessary to plug the memory leak. === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2009-11-26 08:02:33 +0000 +++ b/mysql-test/mysql-test-run.pl 2009-11-27 13:20:59 +0000 @@ -3994,6 +3994,11 @@ sub extract_warning_lines ($) { qr/Slave SQL thread retried transaction/, qr/Slave \(additional info\)/, qr/Incorrect information in file/, + 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:.*/, + qr/Slave I\/O: Get master TIME_ZONE failed with error:.*/, + qr/Slave I\/O: error reconnecting to master '.*' - retry-time: [1-3] retries/, ); my $match_count= 0; === modified file 'mysql-test/suite/rpl/r/rpl_temporary_errors.result' --- a/mysql-test/suite/rpl/r/rpl_temporary_errors.result 2008-10-13 18:33:08 +0000 +++ b/mysql-test/suite/rpl/r/rpl_temporary_errors.result 2009-11-27 13:20:59 +0000 @@ -82,3 +82,4 @@ Last_SQL_Error DROP TABLE t1; **** On Master **** DROP TABLE t1; +STOP SLAVE; === modified file 'mysql-test/suite/rpl/t/rpl_temporary_errors.test' --- a/mysql-test/suite/rpl/t/rpl_temporary_errors.test 2008-10-13 18:33:08 +0000 +++ b/mysql-test/suite/rpl/t/rpl_temporary_errors.test 2009-11-27 13:20:59 +0000 @@ -31,3 +31,12 @@ DROP TABLE t1; --echo **** On Master **** connection master; DROP TABLE t1; + +# We must wait for the slave to stop. +# Otherwise the warnings in the error log about deadlock may be written to +# the error log only during shutdown, and currently the suppression of +# "Deadlock found" set in this test case is not effective during server +# shutdown. +connection slave; +STOP SLAVE; +--source include/wait_for_slave_to_stop.inc === modified file 'sql/sql_select.cc' --- a/sql/sql_select.cc 2009-11-16 20:54:33 +0000 +++ b/sql/sql_select.cc 2009-11-27 13:20:59 +0000 @@ -2311,7 +2311,7 @@ JOIN::destroy() tab->cleanup(); } tmp_join->tmp_join= 0; - tmp_table_param.copy_field= 0; + tmp_table_param.cleanup(); DBUG_RETURN(tmp_join->destroy()); } cond_equal= 0;