diff options
| author | unknown <istruewing@chilla.local> | 2006-12-20 20:14:28 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2006-12-20 20:14:28 +0100 |
| commit | 1fcdd2b1ec4cde73cbc9da91c75fb6f63b7704fb (patch) | |
| tree | 6397b34ccb9d6fc263e929beecf36302d241d304 /storage/myisam/mi_packrec.c | |
| parent | 35583c44eb5721f8986ee152cd12000691274bb1 (diff) | |
| parent | ad858928bcb5b400a1b1e7e15d7938ce3b691f46 (diff) | |
| download | mariadb-git-1fcdd2b1ec4cde73cbc9da91c75fb6f63b7704fb.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
into chilla.local:/home/mydev/mysql-5.1-axmrg
storage/myisam/mi_packrec.c:
Auto merged
storage/myisam/mi_range.c:
Auto merged
storage/myisam/mi_test1.c:
Auto merged
storage/myisam/mi_write.c:
Auto merged
storage/myisam/rt_split.c:
Auto merged
Diffstat (limited to 'storage/myisam/mi_packrec.c')
| -rw-r--r-- | storage/myisam/mi_packrec.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/storage/myisam/mi_packrec.c b/storage/myisam/mi_packrec.c index 84d004c1c2c..fb6b53b9139 100644 --- a/storage/myisam/mi_packrec.c +++ b/storage/myisam/mi_packrec.c @@ -179,12 +179,12 @@ my_bool _mi_read_pack_info(MI_INFO *info, pbool fix_keys) 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)); @@ -366,7 +366,8 @@ static uint read_huff_table(MI_BIT_BUFF *bit_buff, MI_DECODE_TREE *decode_tree, } 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++) { |