diff options
| author | unknown <ram@gw.mysql.r18.ru> | 2004-09-14 17:30:57 +0500 |
|---|---|---|
| committer | unknown <ram@gw.mysql.r18.ru> | 2004-09-14 17:30:57 +0500 |
| commit | 52b355e1f8a23764213fe0b4b352c8226b67f341 (patch) | |
| tree | 412ee0d51414908ff7c63a788c751934f5184738 /sql/sql_repl.cc | |
| parent | 23c2113d9d1eb36f2e6664963758d3ee17949135 (diff) | |
| download | mariadb-git-52b355e1f8a23764213fe0b4b352c8226b67f341.tar.gz | |
A fix (bug #5546: mysqld crash on PURGE MASTER LOGS BEFORE '...' with log-bin off).
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 9 |
1 files 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)); } /* |