bug#21965

merge to 5.1 - yet another merge fix

bug#21965
merge to 5.1 - yet another merge fix
0b65cbaf · jonas@perch.ndb.mysql.com · 724aeb81 · 0b65cbaf
Commit 0b65cbaf authored Sep 04, 2006 by jonas@perch.ndb.mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/log.cc sql/log.cc +1 -1

No files found.
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -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);