bk commit into 5.0 tree (lars:1.1988)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.0 repository of lthalmann. When lthalmann 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.1988 05/11/22 11:34:55 lars@stripped +1 -0
  Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
  into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump

  sql/log_event.cc
    1.198 05/11/22 11:34:41 lars@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:	lars
# Host:	dl145h.mysql.com
# Root:	/users/lthalmann/bk/mysql-5.0-hexdump/RESYNC

--- 1.197/sql/log_event.cc	2005-11-20 19:47:00 +01:00
+++ 1.198/sql/log_event.cc	2005-11-22 11:34:41 +01:00
@@ -901,14 +901,16 @@
     /* Pretty-print event common header if header is exactly 19 bytes */
     if (print_event_info->common_header_len == LOG_EVENT_MINIMAL_HEADER_LEN)
     {
+      DBUG_ASSERT(hexdump_from == (unsigned long) hexdump_from);
       fprintf(file, "# Position  Timestamp   Type   Master ID        "
 	      "Size      Master Pos    Flags \n");
       fprintf(file, "# %8.8lx %02x %02x %02x %02x   %02x   "
 	      "%02x %02x %02x %02x   %02x %02x %02x %02x   "
 	      "%02x %02x %02x %02x   %02x %02x\n",
-	      hexdump_from, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4],
-	      ptr[5], ptr[6], ptr[7], ptr[8], ptr[9], ptr[10], ptr[11],
-	      ptr[12], ptr[13], ptr[14], ptr[15], ptr[16], ptr[17], ptr[18]);
+	      (unsigned long) hexdump_from,
+              ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6],
+              ptr[7], ptr[8], ptr[9], ptr[10], ptr[11], ptr[12], ptr[13],
+              ptr[14], ptr[15], ptr[16], ptr[17], ptr[18]);
       ptr += LOG_EVENT_MINIMAL_HEADER_LEN;
       hexdump_from += LOG_EVENT_MINIMAL_HEADER_LEN;
     }
@@ -925,8 +927,10 @@
 
       if (i % 16 == 15)
       {
+        DBUG_ASSERT(hexdump_from == (unsigned long) hexdump_from);
 	fprintf(file, "# %8.8lx %-48.48s |%16s|\n",
-		hexdump_from + (i & 0xfffffff0), hex_string, char_string);
+		(unsigned long) (hexdump_from + (i & 0xfffffff0)),
+                hex_string, char_string);
 	hex_string[0]= 0;
 	char_string[0]= 0;
 	c= char_string;
@@ -938,8 +942,10 @@
 
     /* Non-full last line */
     if (hex_string[0]) {
-      printf("# %8.8lx %-48.48s |%s|\n# ",
-	     hexdump_from + (i & 0xfffffff0), hex_string, char_string);
+      DBUG_ASSERT(hexdump_from == (unsigned long) hexdump_from);
+      fprintf(file, "# %8.8lx %-48.48s |%s|\n# ",
+	     (unsigned long) (hexdump_from + (i & 0xfffffff0)),
+             hex_string, char_string);
     }
   }
 }