diff options
| author | Kristofer Pettersson <kpettersson@mysql.com> | 2008-07-22 12:41:55 +0200 |
|---|---|---|
| committer | Kristofer Pettersson <kpettersson@mysql.com> | 2008-07-22 12:41:55 +0200 |
| commit | 3d3b04e06d2ddf08c8c6ecbd64cdb3dc71098d2e (patch) | |
| tree | 31a87c6eeaa1a319e6171a5ac75ebef43f4c9d24 /sql/log.cc | |
| parent | d78158f47164d75f4efc75dd8039a337f55c2096 (diff) | |
| parent | 6da6bbc75e03c2fbd66600d679a089cb6d128ba7 (diff) | |
| download | mariadb-git-3d3b04e06d2ddf08c8c6ecbd64cdb3dc71098d2e.tar.gz | |
sql/log.cc:
Auto merge
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/log.cc b/sql/log.cc index a56be801d2b..30575b5befd 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -3096,7 +3096,7 @@ 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; If we could not stat, we won't delete. - */ + */ if (thd) { push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, @@ -3235,6 +3235,7 @@ int MYSQL_BIN_LOG::purge_logs_before_date(time_t purge_time) LOG_INFO log_info; MY_STAT stat_area; THD *thd= current_thd; + DBUG_ENTER("purge_logs_before_date"); pthread_mutex_lock(&LOCK_index); @@ -3263,8 +3264,8 @@ int MYSQL_BIN_LOG::purge_logs_before_date(time_t purge_time) 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'", - log_info.log_file_name); + sql_print_information("Failed to execute my_stat on file '%s'", + log_info.log_file_name); my_errno= 0; } else |