bk commit into 5.0 tree (serg:1.1811)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.0 repository of serg. When serg 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
  1.1811 05/03/14 17:53:24 serg@stripped +2 -0
  sql/log.cc
      don't set LOG_EVENT_BINLOG_IN_USE_F for relay logs
  sql/sql_repl.cc
      clear LOG_EVENT_BINLOG_IN_USE_F flag before sending an event to a slave

  sql/sql_repl.cc
    1.132 05/03/14 17:53:15 serg@stripped +4 -0
    clear LOG_EVENT_BINLOG_IN_USE_F flag before sending an event to a slave

  sql/log.cc
    1.156 05/03/14 17:53:15 serg@stripped +6 -1
    don't set LOG_EVENT_BINLOG_IN_USE_F for relay logs

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-5.0

--- 1.155/sql/log.cc	Mon Mar 14 09:27:26 2005
+++ 1.156/sql/log.cc	Mon Mar 14 17:53:15 2005
@@ -613,7 +613,12 @@
         even if this is not the very first binlog.
       */
       Format_description_log_event s(BINLOG_VERSION);
-      s.flags|= LOG_EVENT_BINLOG_IN_USE_F;
+      /*
+        don't set LOG_EVENT_BINLOG_IN_USE_F for SEQ_READ_APPEND io_cache
+        as we won't be able to reset it later
+      */
+      if (io_cache_type == WRITE_CACHE)
+        s.flags|= LOG_EVENT_BINLOG_IN_USE_F;
       if (!s.is_valid())
         goto err;
       if (null_created_arg)

--- 1.131/sql/sql_repl.cc	Wed Mar  2 10:41:11 2005
+++ 1.132/sql/sql_repl.cc	Mon Mar 14 17:53:15 2005
@@ -456,6 +456,7 @@
        {
          binlog_can_be_corrupted= test((*packet)[FLAGS_OFFSET+1] &
                                        LOG_EVENT_BINLOG_IN_USE_F);
+         (*packet)[FLAGS_OFFSET+1] &= ~LOG_EVENT_BINLOG_IN_USE_F;
          /*
            mark that this event with "log_pos=0", so the slave
            should not increment master's binlog position
@@ -512,8 +513,11 @@
 #endif
 
       if ((*packet)[EVENT_TYPE_OFFSET+1] == FORMAT_DESCRIPTION_EVENT)
+      {
         binlog_can_be_corrupted= test((*packet)[FLAGS_OFFSET+1] &
                                       LOG_EVENT_BINLOG_IN_USE_F);
+        (*packet)[FLAGS_OFFSET+1] &= ~LOG_EVENT_BINLOG_IN_USE_F;
+      }
       else if ((*packet)[EVENT_TYPE_OFFSET+1] == STOP_EVENT)
         binlog_can_be_corrupted= FALSE;