database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

BUG#49638 binlog_index fails in mysql-trunk-merge

Browse Source 
Calling push_warning/push_warning_printf with a level of
WARN_LEVEL_ERROR *is* a bug. We should either use my_error(),
or WARN_LEVEL_WARN.
This commit is contained in:
Alfranio Correia
2009-12-16 19:52:56 +00:00
parent 8b19de0de1
commit ad4bbb281f
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/binlog/r/binlog_index.result
View File

@ -38,7 +38,7 @@ purge binary logs TO 'master-bin.000002';
ERROR HY000: Fatal error during log purge ERROR HY000: Fatal error during log purge
show warnings; show warnings;
Level Code Message Level Code Message
Error 1377 a problem with deleting master-bin.000001; consider examining correspondence of your binlog index file to the actual binlog files Warning 1377 a problem with deleting master-bin.000001; consider examining correspondence of your binlog index file to the actual binlog files
Error 1377 Fatal error during log purge Error 1377 Fatal error during log purge
reset master; reset master;
# crash_purge_before_update_index # crash_purge_before_update_index

12
sql/log.cc
View File

@ -3014,7 +3014,7 @@ bool MYSQL_BIN_LOG::reset_logs(THD* thd)
} }
else else
{ {
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR, push_warning_printf(current_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 "
@ -3045,7 +3045,7 @@ bool MYSQL_BIN_LOG::reset_logs(THD* thd)
} }
else else
{ {
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR, push_warning_printf(current_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 "
@ -3481,7 +3481,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 getting info on being purged %s; " "a problem with getting info on being purged %s; "
"consider examining correspondence " "consider examining correspondence "
@ -3509,7 +3509,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 and " "a problem with deleting %s and "
"reading the binlog index file", "reading the binlog index file",
@ -3557,7 +3557,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 "
@ -3647,7 +3647,7 @@ int MYSQL_BIN_LOG::purge_logs_before_date(time_t purge_time)
*/ */
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 getting info on being purged %s; " "a problem with getting info on being purged %s; "
"consider examining correspondence " "consider examining correspondence "