List:Commits« Previous MessageNext Message »
From:Tatjana A Nuernberg Date:June 27 2007 2:32am
Subject:bk commit into 5.1 tree (tnurnberg:1.2510) BUG#22540
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of tnurnberg. When tnurnberg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-27 04:32:34+02:00, tnurnberg@stripped +1 -0
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
   
  end_log_pos data within a transaction are relative to
  the start of the transaction rather than absolute.
  we fix those groups in situ before writing the log out.
   
  additional comments and handling for groups with very
  large single events, as suggested by Guilhem.

  sql/log.cc@stripped, 2007-06-27 04:32:32+02:00, tnurnberg@stripped +74 -28
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
     
    end_log_pos data within a transaction are relative to
    the start of the transaction rather than absolute.
    we fix those groups in situ before writing the log out.
     
    additional comments and handling for groups with very
    large single events, as suggested by Guilhem.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tnurnberg
# Host:	sin.intern.azundris.com
# Root:	/home/tnurnberg/22540/51-22540

--- 1.286/sql/log.cc	2007-06-25 11:37:08 +02:00
+++ 1.287/sql/log.cc	2007-06-27 04:32:32 +02:00
@@ -3949,65 +3949,111 @@ int MYSQL_BIN_LOG::write_cache(IO_CACHE 
   long val;
   uchar header[LOG_EVENT_HEADER_LEN];
 
+  /*
+    The events in the buffer have incorrect end_log_pos data
+    (relative to beginning of group rather than absolute),
+    so we'll recalculate them in situ so the binlog is always
+    correct, even in the middle of a group. This is possible
+    because we now know the start position of the group (the
+    offset of this cache in the log, if you will); all we need
+    to do is to find all event-headers, and add the position of
+    the group to the end_log_pos of each event.  This is pretty
+    straight forward, except that we read the cache in segments,
+    so an event-header might end up on the cache-border and get
+    split.
+  */
+
   group= my_b_tell(&log_file);
   hdr_offs= carry= 0;
 
   do
   {
-    if (likely(carry > 0))
+
+    /*
+      if we only got a partial header in the last iteration,
+      get the other half now and process a full header.
+    */
+    if (unlikely(carry > 0))
     {
       DBUG_ASSERT(carry < LOG_EVENT_HEADER_LEN);
 
+      /* assemble both halves */
       memcpy(&header[carry], (char *)cache->read_pos, LOG_EVENT_HEADER_LEN - carry);
 
+      /* fix end_log_pos */
       val= uint4korr(&header[LOG_POS_OFFSET]) + group;
       int4store(&header[LOG_POS_OFFSET], val);
 
+      /* write the first half of the split header */
       if (my_b_write(&log_file, header, carry))
         return ER_ERROR_ON_WRITE;
 
+      /*
+        copy fixed second half of header to cache so the correct
+        version will be written later.
+      */
       memcpy((char *)cache->read_pos, &header[carry], LOG_EVENT_HEADER_LEN - carry);
 
+      /* next event header at ... */
       hdr_offs = LOG_EVENT_HEADER_LEN - carry +
         uint4korr(&header[EVENT_LEN_OFFSET]);
 
       carry= 0;
     }
 
+    /* if there is anything to write, process it. */
+
     if(likely(bytes > 0))
     {
-      do {
-        DBUG_ASSERT((hdr_offs + max(EVENT_LEN_OFFSET, LOG_POS_OFFSET) + 4) <= bytes);
-
-        val= uint4korr((char *)cache->read_pos + hdr_offs + LOG_POS_OFFSET) + group;
-        int4store((char *)cache->read_pos + hdr_offs + LOG_POS_OFFSET, val);
-        hdr_offs += uint4korr((char *)cache->read_pos + hdr_offs + EVENT_LEN_OFFSET);
-
-        /* header beyond current read-buffer? */
-        if (hdr_offs >= bytes)
-        {
-          hdr_offs -= bytes;
-          break;
-        }
-
-        /* split header? */
-        if (hdr_offs + LOG_EVENT_HEADER_LEN > bytes)
-        {
-          carry= bytes - hdr_offs;
-
-          memcpy(header, (char *)cache->read_pos + hdr_offs, carry);
-          bytes -= carry;
-        }
-
-      } while (hdr_offs < bytes);
+      /*
+        next header beyond current read-buffer? we'll get it later
+        (though not necessarily in the very next iteration).
+      */
+
+      if (hdr_offs >= bytes)
+        hdr_offs -= bytes;
+      else
+      {
+
+        /* process all event-headers in this (partial) cache. */
+
+        do {
+
+          /*
+            partial header only? save what we can get, process once
+            we get the rest.
+          */
+
+          if (hdr_offs + LOG_EVENT_HEADER_LEN > bytes)
+          {
+            carry= bytes - hdr_offs;
+            memcpy(header, (char *)cache->read_pos + hdr_offs, carry);
+            bytes= hdr_offs;
+          }
+          else
+          {
+            /* we've got a full event-header, and it came in one piece */
+
+            uchar *log_pos= cache->read_pos + hdr_offs + LOG_POS_OFFSET;
+
+            /* fix end_log_pos */
+            val= uint4korr(log_pos) + group;
+            int4store(log_pos, val);
+
+            /* next event header at ... */
+            log_pos= (uchar *)cache->read_pos + hdr_offs + EVENT_LEN_OFFSET;
+            hdr_offs += uint4korr(log_pos);
+
+          }
+        } while (hdr_offs < bytes);
+      }
     }
 
     /* Write data to the binary log file */
-
     if (my_b_write(&log_file, cache->read_pos, bytes))
       return ER_ERROR_ON_WRITE;
-    cache->read_pos= cache->read_end;
-  } while ((bytes= my_b_fill(cache)));
+    cache->read_pos=cache->read_end;		// Mark buffer used up
+  } while ((bytes=my_b_fill(cache)));
 
   if (sync_log)
     flush_and_sync();
Thread
bk commit into 5.1 tree (tnurnberg:1.2510) BUG#22540Tatjana A Nuernberg27 Jun