diff options
| author | monty@donna.mysql.com <> | 2000-09-29 00:58:16 +0300 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2000-09-29 00:58:16 +0300 |
| commit | 02fd65b970a0cdc63cacc944e18fca5ea97973b5 (patch) | |
| tree | b7b27884a7a1c424b00084acf096abc9155bcb32 /isam/pack_isam.c | |
| parent | 17dec8eadd3ecf9e89f801b68c677fbb3b7e7101 (diff) | |
| download | mariadb-git-02fd65b970a0cdc63cacc944e18fca5ea97973b5.tar.gz | |
Fixed indention, removed compiler varnings and fixed a bug
in FULLTEXT indexes.
Diffstat (limited to 'isam/pack_isam.c')
| -rw-r--r-- | isam/pack_isam.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/isam/pack_isam.c b/isam/pack_isam.c index 9193f52a863..1040096fa4a 100644 --- a/isam/pack_isam.c +++ b/isam/pack_isam.c @@ -574,9 +574,9 @@ static int compress(MRG_INFO *mrg,char *result_table) end_file_buffer(); if (verbose && mrg->records) - printf("Min record length: %6d Max length: %6d Mean total length: %6d\n", + printf("Min record length: %6d Max length: %6d Mean total length: %6lu\n", mrg->min_pack_length,mrg->max_pack_length, - (long) new_length/mrg->records); + (ulong) new_length/mrg->records); if (!test_only) { @@ -763,11 +763,11 @@ static int get_statistic(MRG_INFO *mrg,HUFF_COUNTS *huff_counts) { global_count=count; if (!(element=tree_insert(&count->int_tree,pos,0)) || - element->count == 1 && - count->tree_buff + tree_buff_length < - count->tree_pos + count->field_length || - count->field_length == 1 && - count->int_tree.elements_in_tree > 1) + (element->count == 1 && + count->tree_buff + tree_buff_length < + count->tree_pos + count->field_length || + count->field_length == 1 && + count->int_tree.elements_in_tree > 1)) { delete_tree(&count->int_tree); my_free(count->tree_buff,MYF(0)); @@ -1760,8 +1760,8 @@ static int compress_isam_file(MRG_INFO *mrg, HUFF_COUNTS *huff_counts) if (max_record_length >= max_allowed_length) { fprintf(stderr, - "Error: Found record with packed-length: %d, max is: %d\n", - max_record_length,max_allowed_length); + "Error: Found record with packed-length: %d, max is: %lu\n", + max_record_length, (ulong) max_allowed_length); error=1; break; } |