summaryrefslogtreecommitdiff
path: root/sql/sql_binlog.cc
diff options
context:
space:
mode:
authorunknown <monty@mysql.com/nosik.monty.fi>2006-11-27 18:16:08 +0200
committerunknown <monty@mysql.com/nosik.monty.fi>2006-11-27 18:16:08 +0200
commitc1477a3f20897905f3835c4377c9e88841fdd4bb (patch)
tree20c7910ad3251fb39027f6528cd4c0524220a1a0 /sql/sql_binlog.cc
parent24bbc92bddaa4e7e99c6e6d3c1e50d05f87e6507 (diff)
downloadmariadb-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/sql_binlog.cc')
-rw-r--r--sql/sql_binlog.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_binlog.cc b/sql/sql_binlog.cc
index b28d8189631..37094b992e5 100644
--- a/sql/sql_binlog.cc
+++ b/sql/sql_binlog.cc
@@ -114,8 +114,8 @@ void mysql_client_binlog_statement(THD* thd)
order to be able to read exactly what is necessary.
*/
- DBUG_PRINT("info",("binlog base64 decoded_len=%d, bytes_decoded=%d",
- decoded_len, bytes_decoded));
+ DBUG_PRINT("info",("binlog base64 decoded_len: %lu bytes_decoded: %d",
+ (ulong) decoded_len, bytes_decoded));
/*
Now we start to read events of the buffer, until there are no
@@ -161,7 +161,7 @@ void mysql_client_binlog_statement(THD* thd)
(long) (bufptr+EVENT_TYPE_OFFSET)));
DBUG_PRINT("info", ("bytes_decoded: %d bufptr: 0x%lx buf[EVENT_LEN_OFFSET]: %lu",
bytes_decoded, (long) bufptr,
- uint4korr(bufptr+EVENT_LEN_OFFSET)));
+ (ulong) uint4korr(bufptr+EVENT_LEN_OFFSET)));
#endif
ev->thd= thd;
if (int err= ev->exec_event(thd->rli_fake))