Commit ba6b37a0 authored by unknown's avatar unknown
Browse files

bug#21965 

    merge to 5.1 - yet another merge fix


sql/log.cc:
  yet another merge fix
parent 6a81fa6d

sql/log.cc

+1 −1
Original line number Diff line number Diff line
@@ -2266,7 +2266,7 @@ int MYSQL_BIN_LOG::get_current_log(LOG_INFO* linfo) 
  return ret;

}



int MYSQL_LOG::raw_get_current_log(LOG_INFO* linfo)

int MYSQL_BIN_LOG::raw_get_current_log(LOG_INFO* linfo)

{

  strmake(linfo->log_file_name, log_file_name, sizeof(linfo->log_file_name)-1);

  linfo->pos = my_b_tell(&log_file);