diff options
author | unknown <monty@mysql.com/nosik.monty.fi> | 2006-11-27 18:16:08 +0200 |
---|---|---|
committer | unknown <monty@mysql.com/nosik.monty.fi> | 2006-11-27 18:16:08 +0200 |
commit | c1477a3f20897905f3835c4377c9e88841fdd4bb (patch) | |
tree | 20c7910ad3251fb39027f6528cd4c0524220a1a0 /storage/myisam/myisampack.c | |
parent | 24bbc92bddaa4e7e99c6e6d3c1e50d05f87e6507 (diff) | |
download | mariadb-git-c1477a3f20897905f3835c4377c9e88841fdd4bb.tar.gz |
Removed compiler warnings
Ensure that my_size_t is always unsigned (to get predictiable results from system to system)
Removed some %lld, as these are not portable
BUILD/FINISH.sh:
Remove configure files from storage engines (as some of them may be old versions and may cause conflicts)
client/mysqldump.c:
Removed compiler warning
client/mysqlslap.c:
Removed compiler warning
client/mysqltest.c:
Removed compiler warning
cmd-line-utils/readline/bind.c:
Removed compiler warning
cmd-line-utils/readline/histfile.c:
Removed compiler warning
include/my_global.h:
Ensure that my_size_t is always unsigned (to get predictiable results from system to system)
Moved my_offset_t here from parse_file.h
sql/event_data_objects.cc:
Removed compiler warning
sql/event_scheduler.cc:
Removed compiler warning
sql/field.h:
Removed compiler warning
sql/ha_ndbcluster_binlog.cc:
Removed compiler warning
sql/ha_partition.cc:
Removed compiler warning
sql/item_strfunc.cc:
Removed compiler warning
sql/log_event.cc:
Removed compiler warning
sql/mysqld.cc:
Removed compiler warning
sql/parse_file.h:
Moved my_offset_t to my_global.h
sql/rpl_utility.cc:
Removed compiler warning
sql/sql_binlog.cc:
Removed compiler warning
sql/sql_cache.cc:
Removed compiler warning
sql/tztime.cc:
Removed compiler warning
storage/archive/ha_archive.cc:
Removed compiler warning
Removed %lld as it's not portable
storage/heap/hp_write.c:
Removed compiler warning
storage/innobase/os/os0file.c:
Removed compiler warning
storage/myisam/myisampack.c:
Removed compiler warning
storage/myisammrg/myrg_rkey.c:
Removed compiler warning
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
Use my_offsetof instead of offsetof to get rid of compiler warnings
storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
Removed compiler warning
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Removed compiler warning
Note: Someone from NDB team should check this fix!
storage/ndb/src/kernel/vm/Rope.cpp:
Removed compiler warning
storage/ndb/src/mgmapi/mgmapi.cpp:
Removed compiler warning
storage/ndb/src/ndbapi/Ndb.cpp:
Removed compiler warning
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Removed compiler warning
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Removed compiler warning
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Removed compiler warning
storage/ndb/src/ndbapi/Ndblist.cpp:
Removed compiler warning
Diffstat (limited to 'storage/myisam/myisampack.c')
-rw-r--r-- | storage/myisam/myisampack.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/storage/myisam/myisampack.c b/storage/myisam/myisampack.c index 810c12327a0..98121cc6d90 100644 --- a/storage/myisam/myisampack.c +++ b/storage/myisam/myisampack.c @@ -1105,18 +1105,18 @@ 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", count - huff_counts + 1)); + DBUG_PRINT("info", ("column: %3u", (uint) (count - huff_counts) + 1)); if (verbose >= 2) - VOID(printf("column: %3u\n", 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", - (count->tree_pos - count->tree_buff) / - count->field_length)); + (uint) ((count->tree_pos - count->tree_buff) / + count->field_length))); if (verbose >= 2) VOID(printf("number of distinct values: %u\n", - (count->tree_pos - count->tree_buff) / - count->field_length)); + (uint) ((count->tree_pos - count->tree_buff) / + count->field_length))); } total_count= 0; for (idx= 0; idx < 256; idx++) @@ -2279,8 +2279,8 @@ 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/%u\n", - bits, 8 * sizeof(code))); + VOID(fprintf(stderr, "error: Huffman code too long: %u/%lu\n", + bits, (ulong) (8 * sizeof(code)))); errors++; break; } |