diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-17 20:10:18 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-17 20:10:18 +0300 |
| commit | 53da51de9d8fc607063e131cc32361f39d95ac2d (patch) | |
| tree | 39c3d25ed9a8f3e4bc36dfc9cbfd0428f9ddc24e | |
| parent | 5069a666709a66335ded54c6fab4832e155840c1 (diff) | |
| parent | b1090b13fc4b728fd5f552b4f4e7a27e3f1459d4 (diff) | |
| download | mariadb-git-53da51de9d8fc607063e131cc32361f39d95ac2d.tar.gz | |
Manual merge from mysql-5.1-bugteam. Re-enabled binlog.binlog_index.
| -rw-r--r-- | mysql-test/suite/binlog/t/disabled.def | 2 | ||||
| -rw-r--r-- | sql/log.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/binlog/t/disabled.def b/mysql-test/suite/binlog/t/disabled.def index 43bc734035d..0018387de94 100644 --- 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 index 5215dcb9a84..6bda06c71d8 100644 --- 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 " |