From 34aefdf31e792c7a7b0f8c4d19508ff8433f2ac9 Mon Sep 17 00:00:00 2001
From: "guilhem@mysql.com" <>
Date: Thu, 18 Mar 2004 20:53:33 +0200
Subject: Fix for BUG#3214 "mysqlbinlog --read-from-remote-server --position
 prints wrong positions" I am fixing it here in 4.1, not in 4.0, as it goes
 with another change which I did in 4.1 (fix for BUG#3204 ""mysqlbinlog
 --read-from-remote-server this_binlog.001" prints all binlogs").

---
 client/mysqlbinlog.cc | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'client')

diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index 52cdbe09e36..0f3260e903d 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -678,7 +678,7 @@ static int dump_remote_log_entries(const char* logname)
     DBUG_RETURN(1);
   }
 
-  my_off_t old_off= 0;  
+  my_off_t old_off= position;  
   ulonglong rec_count= 0;
   char fname[FN_REFLEN+1];
 
@@ -766,12 +766,10 @@ static int dump_remote_log_entries(const char* logname)
     
     /*
       Let's adjust offset for remote log as for local log to produce 
-      similar text..
+      similar text. As we don't print the fake Rotate event, all events are
+      real so we can simply add the length.
     */
-    if (old_off)
-      old_off+= len-1;
-    else
-      old_off= BIN_LOG_HEADER_SIZE;
+    old_off+= len-1;
   }
   DBUG_RETURN(0);
 }
-- 
cgit v1.2.1