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/archive/ha_archive.cc | |
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/archive/ha_archive.cc')
-rw-r--r-- | storage/archive/ha_archive.cc | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc index 172f0b524fb..f85c3fb4adf 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -329,10 +329,12 @@ int ha_archive::read_meta_file(File meta_file, ha_rows *rows, DBUG_PRINT("ha_archive::read_meta_file", ("Check %d", (uint)meta_buffer[0])); DBUG_PRINT("ha_archive::read_meta_file", ("Version %d", (uint)meta_buffer[1])); - DBUG_PRINT("ha_archive::read_meta_file", ("Rows %llu", *rows)); - DBUG_PRINT("ha_archive::read_meta_file", ("Checkpoint %llu", check_point)); - DBUG_PRINT("ha_archive::read_meta_file", ("Auto-Increment %llu", *auto_increment)); - DBUG_PRINT("ha_archive::read_meta_file", ("Forced Flushes %llu", *forced_flushes)); + DBUG_PRINT("ha_archive::read_meta_file", ("Rows %lu", (ulong) *rows)); + DBUG_PRINT("ha_archive::read_meta_file", ("Checkpoint %lu", (ulong) check_point)); + DBUG_PRINT("ha_archive::read_meta_file", ("Auto-Increment %lu", + (ulong) *auto_increment)); + DBUG_PRINT("ha_archive::read_meta_file", ("Forced Flushes %lu", + (ulong) *forced_flushes)); DBUG_PRINT("ha_archive::read_meta_file", ("Real Path %s", real_path)); DBUG_PRINT("ha_archive::read_meta_file", ("Dirty %d", (int)(*ptr))); @@ -385,12 +387,12 @@ int ha_archive::write_meta_file(File meta_file, ha_rows rows, (uint)ARCHIVE_CHECK_HEADER)); DBUG_PRINT("ha_archive::write_meta_file", ("Version %d", (uint)ARCHIVE_VERSION)); - DBUG_PRINT("ha_archive::write_meta_file", ("Rows %llu", (ulonglong)rows)); - DBUG_PRINT("ha_archive::write_meta_file", ("Checkpoint %llu", check_point)); - DBUG_PRINT("ha_archive::write_meta_file", ("Auto Increment %llu", - auto_increment)); - DBUG_PRINT("ha_archive::write_meta_file", ("Forced Flushes %llu", - forced_flushes)); + DBUG_PRINT("ha_archive::write_meta_file", ("Rows %lu", (ulong) rows)); + DBUG_PRINT("ha_archive::write_meta_file", ("Checkpoint %lu", (ulong) check_point)); + DBUG_PRINT("ha_archive::write_meta_file", ("Auto Increment %lu", + (ulong) auto_increment)); + DBUG_PRINT("ha_archive::write_meta_file", ("Forced Flushes %lu", + (ulong) forced_flushes)); DBUG_PRINT("ha_archive::write_meta_file", ("Real path %s", real_path)); DBUG_PRINT("ha_archive::write_meta_file", ("Dirty %d", (uint)dirty)); @@ -1057,7 +1059,7 @@ int ha_archive::rnd_init(bool scan) if (scan) { scan_rows= share->rows_recorded; - DBUG_PRINT("info", ("archive will retrieve %llu rows", scan_rows)); + DBUG_PRINT("info", ("archive will retrieve %lu rows", (ulong) scan_rows)); stats.records= 0; /* @@ -1318,7 +1320,7 @@ int ha_archive::optimize(THD* thd, HA_CHECK_OPT* check_opt) share->rows_recorded++; } } - DBUG_PRINT("info", ("recovered %llu archive rows", share->rows_recorded)); + DBUG_PRINT("info", ("recovered %lu archive rows", (ulong) share->rows_recorded)); my_free((char*)buf, MYF(0)); if (rc && rc != HA_ERR_END_OF_FILE) |