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

265ec855 · Alexey Kopytov · 41ba832f · 730f52c6 · 265ec855 · 265ec855
Commit 265ec855 authored Dec 17, 2009 by Alexey Kopytov
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mysql-test/suite/binlog/t/disabled.def mysql-test/suite/binlog/t/disabled.def +1 -1

sql/log.cc sql/log.cc +1 -1

No files found.
--- a/mysql-test/suite/binlog/t/disabled.def
+++ b/mysql-test/suite/binlog/t/disabled.def
@@ -10,4 +10,4 @@
 #
 ##############################################################################
 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
+
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -3571,7 +3571,7 @@ int MYSQL_BIN_LOG::purge_index_entry(THD *thd, ulonglong *decrease_log_space,
          {
            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,
                                  "a problem with deleting %s; "
                                  "consider examining correspondence "