Skip to content

M
mariadb
Commit f5668bc8 authored by Kristofer Pettersson's avatar Kristofer Pettersson
Browse files
Options

Corrected merge misstake.

parent 3f332cea
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 36 deletions
sql/log.cc
View file @ f5668bc8
...@@ -3070,7 +3070,7 @@ int MYSQL_BIN_LOG::purge_logs(const char *to_log, ...@@ -3070,7 +3070,7 @@ int MYSQL_BIN_LOG::purge_logs(const char *to_log,
int ret = 0; int ret = 0;
bool exit_loop= 0; bool exit_loop= 0;
LOG_INFO log_info; LOG_INFO log_info;
THD *thd =current_thd; THD *thd= current_thd;
DBUG_ENTER("purge_logs"); DBUG_ENTER("purge_logs");
DBUG_PRINT("info",("to_log= %s",to_log)); DBUG_PRINT("info",("to_log= %s",to_log));
...@@ -3097,9 +3097,12 @@ int MYSQL_BIN_LOG::purge_logs(const char *to_log, ...@@ -3097,9 +3097,12 @@ int MYSQL_BIN_LOG::purge_logs(const char *to_log,
It's not fatal if we can't stat a log file that does not exist; It's not fatal if we can't stat a log file that does not exist;
If we could not stat, we won't delete. If we could not stat, we won't delete.
*/ */
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, if (thd)
ER_LOG_PURGE_NO_FILE, ER(ER_LOG_PURGE_NO_FILE), {
log_info.log_file_name); push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
ER_LOG_PURGE_NO_FILE, ER(ER_LOG_PURGE_NO_FILE),
log_info.log_file_name);
}
sql_print_information("Failed to execute my_stat on file '%s'", sql_print_information("Failed to execute my_stat on file '%s'",
log_info.log_file_name); log_info.log_file_name);
my_errno= 0; my_errno= 0;
...@@ -3109,13 +3112,24 @@ int MYSQL_BIN_LOG::purge_logs(const char *to_log, ...@@ -3109,13 +3112,24 @@ int MYSQL_BIN_LOG::purge_logs(const char *to_log,
/* /*
Other than ENOENT are fatal Other than ENOENT are fatal
*/ */
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR, if (thd)
ER_BINLOG_PURGE_FATAL_ERR, {
"a problem with getting info on being purged %s; " push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
"consider examining correspondence " ER_BINLOG_PURGE_FATAL_ERR,
"of your binlog index file " "a problem with getting info on being purged %s; "
"to the actual binlog files", "consider examining correspondence "
log_info.log_file_name); "of your binlog index file "
"to the actual binlog files",
log_info.log_file_name);
}
else
{
sql_print_information("Failed to delete log file '%s'; "
"consider examining correspondence "
"of your binlog index file "
"to the actual binlog files",
log_info.log_file_name);
}
error= LOG_INFO_FATAL; error= LOG_INFO_FATAL;
goto err; goto err;
} }
...@@ -3132,9 +3146,12 @@ int MYSQL_BIN_LOG::purge_logs(const char *to_log, ...@@ -3132,9 +3146,12 @@ int MYSQL_BIN_LOG::purge_logs(const char *to_log,
{ {
if (my_errno == ENOENT) if (my_errno == ENOENT)
{ {
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, if (thd)
ER_LOG_PURGE_NO_FILE, ER(ER_LOG_PURGE_NO_FILE), {
log_info.log_file_name); push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
ER_LOG_PURGE_NO_FILE, ER(ER_LOG_PURGE_NO_FILE),
log_info.log_file_name);
}
sql_print_information("Failed to delete file '%s'", sql_print_information("Failed to delete file '%s'",
log_info.log_file_name); log_info.log_file_name);
my_errno= 0; my_errno= 0;
...@@ -3217,7 +3234,7 @@ int MYSQL_BIN_LOG::purge_logs_before_date(time_t purge_time) ...@@ -3217,7 +3234,7 @@ int MYSQL_BIN_LOG::purge_logs_before_date(time_t purge_time)
int error; int error;
LOG_INFO log_info; LOG_INFO log_info;
MY_STAT stat_area; MY_STAT stat_area;
THD *thd= current_thd;
DBUG_ENTER("purge_logs_before_date"); DBUG_ENTER("purge_logs_before_date");
pthread_mutex_lock(&LOCK_index); pthread_mutex_lock(&LOCK_index);
...@@ -3239,10 +3256,13 @@ int MYSQL_BIN_LOG::purge_logs_before_date(time_t purge_time) ...@@ -3239,10 +3256,13 @@ int MYSQL_BIN_LOG::purge_logs_before_date(time_t purge_time)
{ {
/* /*
It's not fatal if we can't stat a log file that does not exist. It's not fatal if we can't stat a log file that does not exist.
*/ */
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, if (thd)
ER_LOG_PURGE_NO_FILE, ER(ER_LOG_PURGE_NO_FILE), {
log_info.log_file_name); push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
ER_LOG_PURGE_NO_FILE, ER(ER_LOG_PURGE_NO_FILE),
log_info.log_file_name);
}
sql_print_information("Failed to execute my_stat on file '%s'", sql_print_information("Failed to execute my_stat on file '%s'",
log_info.log_file_name); log_info.log_file_name);
my_errno= 0; my_errno= 0;
...@@ -3252,13 +3272,21 @@ int MYSQL_BIN_LOG::purge_logs_before_date(time_t purge_time) ...@@ -3252,13 +3272,21 @@ int MYSQL_BIN_LOG::purge_logs_before_date(time_t purge_time)
/* /*
Other than ENOENT are fatal Other than ENOENT are fatal
*/ */
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR, if (thd)
ER_BINLOG_PURGE_FATAL_ERR, {
"a problem with getting info on being purged %s; " push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
"consider examining correspondence " ER_BINLOG_PURGE_FATAL_ERR,
"of your binlog index file " "a problem with getting info on being purged %s; "
"to the actual binlog files", "consider examining correspondence "
log_info.log_file_name); "of your binlog index file "
"to the actual binlog files",
log_info.log_file_name);
}
else
{
sql_print_information("Failed to delete log file '%s'",
log_info.log_file_name);
}
error= LOG_INFO_FATAL; error= LOG_INFO_FATAL;
goto err; goto err;
} }
...@@ -3272,22 +3300,33 @@ int MYSQL_BIN_LOG::purge_logs_before_date(time_t purge_time) ...@@ -3272,22 +3300,33 @@ int MYSQL_BIN_LOG::purge_logs_before_date(time_t purge_time)
if (my_errno == ENOENT) if (my_errno == ENOENT)
{ {
/* It's not fatal even if we can't delete a log file */ /* It's not fatal even if we can't delete a log file */
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, if (thd)
ER_LOG_PURGE_NO_FILE, ER(ER_LOG_PURGE_NO_FILE), {
log_info.log_file_name); push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
ER_LOG_PURGE_NO_FILE, ER(ER_LOG_PURGE_NO_FILE),
log_info.log_file_name);
}
sql_print_information("Failed to delete file '%s'", sql_print_information("Failed to delete file '%s'",
log_info.log_file_name); log_info.log_file_name);
my_errno= 0; my_errno= 0;
} }
else else
{ {
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR, if (thd)
ER_BINLOG_PURGE_FATAL_ERR, {
"a problem with deleting %s; " push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
"consider examining correspondence " ER_BINLOG_PURGE_FATAL_ERR,
"of your binlog index file " "a problem with deleting %s; "
"to the actual binlog files", "consider examining correspondence "
log_info.log_file_name); "of your binlog index file "
"to the actual binlog files",
log_info.log_file_name);
}
else
{
sql_print_information("Failed to delete log file '%s'",
log_info.log_file_name);
}
error= LOG_INFO_FATAL; error= LOG_INFO_FATAL;
goto err; goto err;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7