bk commit into 5.1 tree (mats:1.2344)

[Mats Kindahl]

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-10-06 08:41:34+02:00, mats@romeo.(none) +1 -0
  Fix to build on 64-bit systems where sizeof(unsigned long long)
  > sizeof(unsigned long).

  sql/log.cc@stripped, 2006-10-06 08:41:31+02:00, mats@romeo.(none) +4 -7
    Replacing enum constant that contained an unsigned long long constant
    on some platforms with a macro (an enumeration constant is limited
    to the range of values covered by signed or unsigned long).

# 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/b20265-mysql-5.1-new-rpl

--- 1.236/sql/log.cc	2006-10-06 08:41:42 +02:00
+++ 1.237/sql/log.cc	2006-10-06 08:41:42 +02:00
@@ -45,6 +45,7 @@
 #define MAX_LOG_BUFFER_SIZE 1024
 #define MAX_USER_HOST_SIZE 512
 #define MAX_TIME_SIZE 32
+#define MY_OFF_T_UNDEF (~(my_off_t)0UL)
 
 #define FLAGSTR(V,F) ((V)&(F)?#F" ":"")
 
@@ -85,13 +86,9 @@
 */
 class binlog_trx_data {
 public:
-  enum {
-    UNDEF_POS = ~ (my_off_t) 0
-  };
-
   binlog_trx_data()
 #ifdef HAVE_ROW_BASED_REPLICATION
-    : m_pending(0), before_stmt_pos(UNDEF_POS)
+    : m_pending(0), before_stmt_pos(MY_OFF_T_UNDEF)
 #endif
   {
     trans_log.end_of_file= max_binlog_cache_size;
@@ -139,7 +136,7 @@
     if (!empty())
       truncate(0);
 #ifdef HAVE_ROW_BASED_REPLICATION
-    before_stmt_pos= UNDEF_POS;
+    before_stmt_pos= MY_OFF_T_UNDEF;
 #endif
     trans_log.end_of_file= max_binlog_cache_size;
   }
@@ -3338,7 +3335,7 @@
     DBUG_PRINT("enter", ("trx_data->before_stmt_pos=%u",
                          trx_data->before_stmt_pos));
   if (trx_data == NULL ||
-      trx_data->before_stmt_pos == binlog_trx_data::UNDEF_POS)
+      trx_data->before_stmt_pos == MY_OFF_T_UNDEF)
   {
     /*
       The call to binlog_trans_log_savepos() might create the trx_data