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

Alexey Kopytov · Alexey Kopytov · commit e6f0b154378f · 2009-12-17T20:10:18.000+03:00
diff --git 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
+
diff --git 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 "

Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,4 @@`
`10`	`10`	`#`
`11`	`11`	`##############################################################################`
`12`	`12`	`binlog_truncate_innodb : BUG#42643 2009-02-06 mats Changes to InnoDB requires to complete fix for BUG#36763`
`13`		`-binlog_index : BUG#49638 2009-12-12 kaamos`
	`13`	`+`
Original file line number	Diff line number	Diff line change
`@@ -3571,7 +3571,7 @@ int MYSQL_BIN_LOG::purge_index_entry(THD thd, ulonglong decrease_log_space,`
`3571`	`3571`	`{`
`3572`	`3572`	`if (thd)`
`3573`	`3573`	`{`
`3574`		`- push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,`
	`3574`	`+ push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,`
`3575`	`3575`	`ER_BINLOG_PURGE_FATAL_ERR,`
`3576`	`3576`	`"a problem with deleting %s; "`
`3577`	`3577`	`"consider examining correspondence "`