From 52b355e1f8a23764213fe0b4b352c8226b67f341 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 14 Sep 2004 17:30:57 +0500 Subject: [PATCH 1/2] A fix (bug #5546: mysqld crash on PURGE MASTER LOGS BEFORE '...' with log-bin off). --- sql/sql_repl.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 32c5f0bfdab..d9f02488077 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -306,8 +306,13 @@ int purge_master_logs(THD* thd, const char* to_log) int purge_master_logs_before_date(THD* thd, time_t purge_time) { - int res = mysql_bin_log.purge_logs_before_date(purge_time); - return purge_error_message(thd ,res); + if (!mysql_bin_log.is_open()) + { + send_ok(current_thd); + return 0; + } + return purge_error_message(thd, + mysql_bin_log.purge_logs_before_date(purge_time)); } /* From f198cb35b7729d5b72c3fea4f50b0adf904789a4 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 14 Sep 2004 18:57:22 +0500 Subject: [PATCH 2/2] code clean-up sql/sql_repl.cc: code clean-up: we can use thd here. --- sql/sql_repl.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index d9f02488077..f71d5a311ab 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -293,7 +293,7 @@ int purge_master_logs(THD* thd, const char* to_log) char search_file_name[FN_REFLEN]; if (!mysql_bin_log.is_open()) { - send_ok(current_thd); + send_ok(thd); return 0; } @@ -308,7 +308,7 @@ int purge_master_logs_before_date(THD* thd, time_t purge_time) { if (!mysql_bin_log.is_open()) { - send_ok(current_thd); + send_ok(thd); return 0; } return purge_error_message(thd,