summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorAlexey Kopytov <Alexey.Kopytov@Sun.com>2009-12-17 20:10:18 +0300
committerAlexey Kopytov <Alexey.Kopytov@Sun.com>2009-12-17 20:10:18 +0300
commit53da51de9d8fc607063e131cc32361f39d95ac2d (patch)
tree39c3d25ed9a8f3e4bc36dfc9cbfd0428f9ddc24e /sql
parent5069a666709a66335ded54c6fab4832e155840c1 (diff)
parentb1090b13fc4b728fd5f552b4f4e7a27e3f1459d4 (diff)
downloadmariadb-git-53da51de9d8fc607063e131cc32361f39d95ac2d.tar.gz
Manual merge from mysql-5.1-bugteam. Re-enabled binlog.binlog_index.
Diffstat (limited to 'sql')
-rw-r--r--sql/log.cc2
1 files changed, 1 insertions, 1 deletions
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 "