Commit 1afd5d4d authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5546
parents de677cf8 07860c53

sql/sql_repl.cc

+8 −3
Original line number Diff line number Diff line
@@ -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;

  }
@@ -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(thd);

    return 0;

  }

  return purge_error_message(thd,

                             mysql_bin_log.purge_logs_before_date(purge_time));

}



/*