1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

After-merge fixes for MySQL 5.1.41 merge into MariaDB: more fixes for Buildbot problems.

Browse Source 
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.
This commit is contained in:
unknown 2009-11-27 14:20:59 +01:00
parent d44270afe7
commit 84911a9fd0
4 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/mysql-test-run.pl
View File

@ -3994,6 +3994,11 @@ sub extract_warning_lines ($) {
qr/Slave SQL thread retried transaction/, qr/Slave SQL thread retried transaction/,
qr/Slave \(additional info\)/, qr/Slave \(additional info\)/,
qr/Incorrect information in file/, 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; my $match_count= 0;

1
mysql-test/suite/rpl/r/rpl_temporary_errors.result
View File

@ -82,3 +82,4 @@ Last_SQL_Error
DROP TABLE t1; DROP TABLE t1;
**** On Master **** **** On Master ****
DROP TABLE t1; DROP TABLE t1;
STOP SLAVE;

9
mysql-test/suite/rpl/t/rpl_temporary_errors.test
View File

@ -31,3 +31,12 @@ DROP TABLE t1;
--echo **** On Master **** --echo **** On Master ****
connection master; connection master;
DROP TABLE t1; 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

2
sql/sql_select.cc
View File

@ -2311,7 +2311,7 @@ JOIN::destroy()
tab->cleanup(); tab->cleanup();
} }
tmp_join->tmp_join= 0; tmp_join->tmp_join= 0;
tmp_table_param.copy_field= 0; tmp_table_param.cleanup();
DBUG_RETURN(tmp_join->destroy()); DBUG_RETURN(tmp_join->destroy());
} }
cond_equal= 0; cond_equal= 0;