bk commit into 5.1 tree (knielsen:1.2067)

[knielsen]

Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen 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.2067 06/01/17 15:52:02 knielsen@stripped +3 -0
  Merge bk-internal:/home/bk/mysql-5.1-new
  into  mysql.com:/usr/local/mysql/mysql-5.1-relmerge

  sql/log_event.cc
    1.199 06/01/17 15:51:58 knielsen@stripped +0 -3
    Manual merge

  sql/log_event.h
    1.127 06/01/17 15:45:29 knielsen@stripped +0 -0
    Auto merged

  include/config-win.h
    1.79 06/01/17 15:45:29 knielsen@stripped +0 -0
    Auto merged

# 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:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/mysql-5.1-relmerge/RESYNC

--- 1.198/sql/log_event.cc	2006-01-17 12:43:32 +01:00
+++ 1.199/sql/log_event.cc	2006-01-17 15:51:58 +01:00
@@ -6171,7 +6171,7 @@
   */
   DBUG_ASSERT(table->s->fields >= m_width);
   DBUG_ASSERT(ptr);
-  ptr= unpack_row(table, (char*)table->record[0], ptr, &m_cols);
+  ptr= unpack_row(table, (byte*)table->record[0], ptr, &m_cols);
   return ptr;
 }
 

--- 1.126/sql/log_event.h	2006-01-17 12:43:33 +01:00
+++ 1.127/sql/log_event.h	2006-01-17 15:45:29 +01:00
@@ -419,7 +419,9 @@
 #define OPTIONS_WRITTEN_TO_BIN_LOG (OPTION_AUTO_IS_NULL | \
 OPTION_NO_FOREIGN_KEY_CHECKS | OPTION_RELAXED_UNIQUE_CHECKS)
 
-#if OPTIONS_WRITTEN_TO_BIN_LOG != ((1L << 14) | (1L << 26) | (1L << 27))
+/* Visual studio 2003 does not accept the constant expression
+   ((1L << 14) | (1L << 26) | (1L << 27)), use 0x0c0040 instead. */
+#if OPTIONS_WRITTEN_TO_BIN_LOG != 0x0c004000
 #error OPTIONS_WRITTEN_TO_BIN_LOG must NOT change their values!
 #endif