database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code 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
Download Patch File Download Diff File Expand all files Collapse all files

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

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