bk commit into 4.1 tree (istruewing:1.2585) BUG#25208

[ingo]

Below is the list of changes that have just been committed into a local
4.1 repository of istruewing. When istruewing 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-12-20 15:18:09+01:00, istruewing@stripped +1 -0
  Bug#25208 - Warnings in mi_packrec.c
  
  Compiler warnings due to non-matching conversion
  specifications in format strings in DBUG_PRINT calls.
  
  Fixed DBUG_PRINT format specifiactions.

  myisam/mi_packrec.c@stripped, 2006-12-20 15:18:08+01:00, istruewing@stripped +7 -6
    Bug#25208 - Warnings in mi_packrec.c
    Fixed DBUG_PRINT format specifiactions.

# 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:	istruewing
# Host:	chilla.local
# Root:	/home/mydev/mysql-4.1-axmrg

--- 1.31/myisam/mi_packrec.c	2006-12-20 15:18:13 +01:00
+++ 1.32/myisam/mi_packrec.c	2006-12-20 15:18:13 +01:00
@@ -177,12 +177,12 @@ my_bool _mi_read_pack_info(MI_INFO *info
   if (share->min_pack_length > 254)
     share->base.min_block_length+=2;
   DBUG_PRINT("info", ("fixed header length:   %u", HEAD_LENGTH));
-  DBUG_PRINT("info", ("total header length:   %u", share->pack.header_length));
+  DBUG_PRINT("info", ("total header length:   %lu", share->pack.header_length));
   DBUG_PRINT("info", ("pack file version:     %u", share->pack.version));
-  DBUG_PRINT("info", ("min pack length:       %u", share->min_pack_length));
-  DBUG_PRINT("info", ("max pack length:       %u", share->max_pack_length));
-  DBUG_PRINT("info", ("elements of all trees: %u", elements));
-  DBUG_PRINT("info", ("distinct values bytes: %u", intervall_length));
+  DBUG_PRINT("info", ("min pack length:       %lu", share->min_pack_length));
+  DBUG_PRINT("info", ("max pack length:       %lu", share->max_pack_length));
+  DBUG_PRINT("info", ("elements of all trees: %lu", elements));
+  DBUG_PRINT("info", ("distinct values bytes: %lu", intervall_length));
   DBUG_PRINT("info", ("number of code trees:  %u", trees));
   DBUG_PRINT("info", ("bytes for record lgt:  %u", share->pack.ref_length));
   DBUG_PRINT("info", ("record pointer length: %u", rec_reflength));
@@ -364,7 +364,8 @@ static uint read_huff_table(MI_BIT_BUFF 
   }
   size=elements*2-2;
   DBUG_PRINT("info", ("tree size in uint16:   %u", size));
-  DBUG_PRINT("info", ("tree size in bytes:    %u", size * sizeof(uint16)));
+  DBUG_PRINT("info", ("tree size in bytes:    %u",
+                      size * (uint) sizeof(uint16)));
 
   for (end=ptr+size ; ptr < end ; ptr++)
   {