bk commit into 5.1 tree (jonas:1.2031)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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-10-04 13:47:54+02:00, jonas@stripped +1 -0
  ndb - slave optimization patch 32/64 bit bug
  Fix bug when using OPTION_SLAVE_BATCH that would be incorrectly removed as ulong is 32-bit on 32-bit machines
    but thd->options is ulonglong (and ulong is 64-bit on 64-bit machines, which made me not find bug locally)
  

  sql/log_event.cc@stripped, 2006-10-04 13:47:51+02:00, jonas@stripped +1 -1
    Fix bug when using OPTION_SLAVE_BATCH that would be incorrectly removed as ulong is 32-bit on 32-bit machines
      but thd->options is ulonglong (and ulong is 64-bit on 64-bit machines, which made me not find bug locally)
    

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/drop5p14d

--- 1.209/sql/log_event.cc	2006-10-04 13:47:57 +02:00
+++ 1.210/sql/log_event.cc	2006-10-04 13:47:57 +02:00
@@ -1639,7 +1639,7 @@
           all bits of thd->options which are 1 in OPTIONS_WRITTEN_TO_BIN_LOG must
           take their value from flags2.
         */
-        thd->options= flags2|(thd->options & ~(ulong)OPTIONS_WRITTEN_TO_BIN_LOG);
+        thd->options= flags2|(thd->options & ~(ulonglong)OPTIONS_WRITTEN_TO_BIN_LOG);
       /*
         else, we are in a 3.23/4.0 binlog; we previously received a
         Rotate_log_event which reset thd->options and sql_mode etc, so nothing to do.