diff options
| author | monty@mysql.com/nosik.monty.fi <> | 2006-11-27 01:47:38 +0200 |
|---|---|---|
| committer | monty@mysql.com/nosik.monty.fi <> | 2006-11-27 01:47:38 +0200 |
| commit | fa81a82e7f2d03a4f60b1783d578ca1abeddfae9 (patch) | |
| tree | b29f99476834178f395c188e1c4d352dd106fc01 /sql/sql_binlog.cc | |
| parent | 89570bf966570ecce761e1fea2bb5d10db91f621 (diff) | |
| download | mariadb-git-fa81a82e7f2d03a4f60b1783d578ca1abeddfae9.tar.gz | |
Fixed a LOT of compiler warnings
Added missing DBUG_RETURN statements (in mysqldump.c)
Added missing enums
Fixed a lot of wrong DBUG_PRINT() statements, some of which could cause crashes
Removed usage of %lld and %p in printf strings as these are not portable or produces different results on different systems.
Diffstat (limited to 'sql/sql_binlog.cc')
| -rw-r--r-- | sql/sql_binlog.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sql/sql_binlog.cc b/sql/sql_binlog.cc index 23ca5330053..a48c0ac0b31 100644 --- a/sql/sql_binlog.cc +++ b/sql/sql_binlog.cc @@ -80,8 +80,9 @@ void mysql_client_binlog_statement(THD* thd) int bytes_decoded= base64_decode(strptr, coded_len, buf, &endptr); DBUG_PRINT("info", - ("bytes_decoded=%d; strptr=0x%lu; endptr=0x%lu ('%c':%d)", - bytes_decoded, strptr, endptr, *endptr, *endptr)); + ("bytes_decoded: %d strptr: 0x%lx endptr: 0x%lx ('%c':%d)", + bytes_decoded, (long) strptr, (long) endptr, *endptr, + *endptr)); if (bytes_decoded < 0) { @@ -145,14 +146,15 @@ void mysql_client_binlog_statement(THD* thd) bufptr += event_len; DBUG_PRINT("info",("ev->get_type_code()=%d", ev->get_type_code())); - DBUG_PRINT("info",("bufptr+EVENT_TYPE_OFFSET=0x%lx", - bufptr+EVENT_TYPE_OFFSET)); - DBUG_PRINT("info", ("bytes_decoded=%d; bufptr=0x%lx; buf[EVENT_LEN_OFFSET]=%u", - bytes_decoded, bufptr, uint4korr(bufptr+EVENT_LEN_OFFSET))); + DBUG_PRINT("info",("bufptr+EVENT_TYPE_OFFSET: 0x%lx", + (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))); ev->thd= thd; if (int err= ev->exec_event(thd->rli_fake)) { - DBUG_PRINT("info", ("exec_event() - error=%d", error)); + DBUG_PRINT("error", ("exec_event() returned: %d", err)); /* TODO: Maybe a better error message since the BINLOG statement now contains several events. |