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 /sql/rpl_utility.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 'sql/rpl_utility.cc')
-rw-r--r-- | sql/rpl_utility.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc index c80b6dc3f69..4bed1343e55 100644 --- a/sql/rpl_utility.cc +++ b/sql/rpl_utility.cc @@ -25,7 +25,7 @@ field_length_from_packed(enum_field_types const field_type, switch (field_type) { case MYSQL_TYPE_DECIMAL: case MYSQL_TYPE_NEWDECIMAL: - length= ~0UL; + length= ~(uint32) 0; break; case MYSQL_TYPE_YEAR: case MYSQL_TYPE_TINY: @@ -71,7 +71,7 @@ field_length_from_packed(enum_field_types const field_type, break; break; case MYSQL_TYPE_BIT: - length= ~0UL; + length= ~(uint32) 0; break; default: /* This case should never be chosen */ @@ -85,7 +85,7 @@ field_length_from_packed(enum_field_types const field_type, case MYSQL_TYPE_SET: case MYSQL_TYPE_VAR_STRING: case MYSQL_TYPE_VARCHAR: - length= ~0UL; // NYI + length= ~(uint32) 0; // NYI break; case MYSQL_TYPE_TINY_BLOB: @@ -93,7 +93,7 @@ field_length_from_packed(enum_field_types const field_type, case MYSQL_TYPE_LONG_BLOB: case MYSQL_TYPE_BLOB: case MYSQL_TYPE_GEOMETRY: - length= ~0UL; // NYI + length= ~(uint32) 0; // NYI break; } @@ -131,7 +131,8 @@ table_def::compatible_with(RELAY_LOG_INFO *rli, TABLE *table) slave_print_msg(ERROR_LEVEL, rli, ER_BINLOG_ROW_WRONG_TABLE_DEF, "Table width mismatch - " "received %u columns, %s.%s has %u columns", - size(), tsh->db.str, tsh->table_name.str, tsh->fields); + (uint) size(), tsh->db.str, tsh->table_name.str, + tsh->fields); } for (uint col= 0 ; col < cols_to_check ; ++col) |