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

Manual merge from mysql-5.1-bugteam. Re-enabled binlog.binlog_index.

Browse Source
This commit is contained in:
Alexey Kopytov 2009-12-17 20:10:18 +03:00
commit 53da51de9d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/binlog/t/disabled.def
View File

@ -10,4 +10,4 @@
# #
############################################################################## ##############################################################################
binlog_truncate_innodb : BUG#42643 2009-02-06 mats Changes to InnoDB requires to complete fix for BUG#36763 binlog_truncate_innodb : BUG#42643 2009-02-06 mats Changes to InnoDB requires to complete fix for BUG#36763
binlog_index : BUG#49638 2009-12-12 kaamos

2
sql/log.cc
View File

@ -3571,7 +3571,7 @@ int MYSQL_BIN_LOG::purge_index_entry(THD *thd, ulonglong *decrease_log_space,
{ {
if (thd) if (thd)
{ {
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
ER_BINLOG_PURGE_FATAL_ERR, ER_BINLOG_PURGE_FATAL_ERR,
"a problem with deleting %s; " "a problem with deleting %s; "
"consider examining correspondence " "consider examining correspondence "