diff options
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/mi_create.c | 6 | ||||
| -rw-r--r-- | storage/myisam/myisampack.c | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/storage/myisam/mi_create.c b/storage/myisam/mi_create.c index f8fad493a91..3cdc42c85bc 100644 --- a/storage/myisam/mi_create.c +++ b/storage/myisam/mi_create.c @@ -438,9 +438,9 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, block_length= max(block_length, MI_MIN_KEY_BLOCK_LENGTH); block_length= min(block_length, MI_MAX_KEY_BLOCK_LENGTH); - keydef->block_length= MI_BLOCK_SIZE(length-real_length_diff, - pointer,MI_MAX_KEYPTR_SIZE, - block_length); + keydef->block_length= (uint16) MI_BLOCK_SIZE(length-real_length_diff, + pointer,MI_MAX_KEYPTR_SIZE, + block_length); if (keydef->block_length > MI_MAX_KEY_BLOCK_LENGTH || length >= MI_MAX_KEY_BUFF) { diff --git a/storage/myisam/myisampack.c b/storage/myisam/myisampack.c index 98121cc6d90..36c328bd089 100644 --- a/storage/myisam/myisampack.c +++ b/storage/myisam/myisampack.c @@ -1105,9 +1105,9 @@ static int get_statistic(PACK_MRG_INFO *mrg,HUFF_COUNTS *huff_counts) my_off_t total_count; char llbuf[32]; - DBUG_PRINT("info", ("column: %3u", (uint) (count - huff_counts) + 1)); + DBUG_PRINT("info", ("column: %3u", (uint) (count - huff_counts + 1))); if (verbose >= 2) - VOID(printf("column: %3u\n", (uint) (count - huff_counts) + 1)); + VOID(printf("column: %3u\n", (uint) (count - huff_counts + 1))); if (count->tree_buff) { DBUG_PRINT("info", ("number of distinct values: %u", @@ -2279,8 +2279,7 @@ static my_off_t write_huff_tree(HUFF_TREE *huff_tree, uint trees) if (bits > 8 * sizeof(code)) { VOID(fflush(stdout)); - VOID(fprintf(stderr, "error: Huffman code too long: %u/%lu\n", - bits, (ulong) (8 * sizeof(code)))); + bits, (uint) (8 * sizeof(code)))); errors++; break; } |