From: Date: December 22 2006 12:09pm
Subject: bk commit into 5.1 tree (mats:1.2365) BUG#22864
List-Archive: http://lists.mysql.com/commits/17317
X-Bug: 22864
Message-Id: <20061222110952.AEAFB1F858@romeo>

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats 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, 2006-12-22 12:09:44+01:00, mats@romeo.(none) +1 -0
  BUG#22864 (CREATE-SELECT does not work correctly):
  Post-merge fixes.

  sql/log.cc@stripped, 2006-12-22 12:09:35+01:00, mats@romeo.(none) +0 -2
    Removing HAVE_ROW_BASED_REPLICATION from file.

# 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:	mats
# Host:	romeo.(none)
# Root:	/home/bk/merge-b22864-myql-5.1-new-rpl

--- 1.250/sql/log.cc	2006-12-22 12:09:52 +01:00
+++ 1.251/sql/log.cc	2006-12-22 12:09:52 +01:00
@@ -148,7 +148,6 @@
    */
   void truncate(my_off_t pos)
   {
-#ifdef HAVE_ROW_BASED_REPLICATION
     DBUG_PRINT("info", ("truncating to position %lu", pos));
     DBUG_PRINT("info", ("before_stmt_pos=%lu", pos));
     delete pending();
@@ -156,7 +155,6 @@
     reinit_io_cache(&trans_log, WRITE_CACHE, pos, 0, 0);
     if (pos < before_stmt_pos)
       before_stmt_pos= MY_OFF_T_UNDEF;
-#endif
   }
 
   /*