bk commit into 5.0 tree (lars:1.1959)

[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.1959 05/11/15 22:49:54 lars@stripped +1 -0
  Added explicit casts, since on i686, the fprintf function does not cast my_off_t correctly.
  Changed wrong printf to fprintf.

  sql/log_event.cc
    1.197 05/11/15 22:49:47 lars@stripped +7 -5
    Added explicit casts, changed wrong printf to fprintf

# 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

--- 1.196/sql/log_event.cc	2005-10-19 19:42:06 +02:00
+++ 1.197/sql/log_event.cc	2005-11-15 22:49:47 +01:00
@@ -906,8 +906,8 @@
       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],
+	      (unsigned int) 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;
@@ -926,7 +926,8 @@
       if (i % 16 == 15)
       {
 	fprintf(file, "# %8.8lx %-48.48s |%16s|\n",
-		hexdump_from + (i & 0xfffffff0), hex_string, char_string);
+		(unsigned int) (hexdump_from + (i & 0xfffffff0)),
+                 hex_string, char_string);
 	hex_string[0]= 0;
 	char_string[0]= 0;
 	c= char_string;
@@ -938,8 +939,9 @@
 
     /* Non-full last line */
     if (hex_string[0]) {
-      printf("# %8.8lx %-48.48s |%s|\n# ",
-	     hexdump_from + (i & 0xfffffff0), hex_string, char_string);
+      fprintf(file, "# %8.8lx %-48.48s |%s|\n# ",
+              (unsigned int) (hexdump_from + (i & 0xfffffff0)),
+              hex_string, char_string);
     }
   }
 }