diff options
| author | mats@romeo.(none) <> | 2006-11-23 16:21:53 +0100 |
|---|---|---|
| committer | mats@romeo.(none) <> | 2006-11-23 16:21:53 +0100 |
| commit | 333f794adc1ff447b2245e6aca405df1dec50665 (patch) | |
| tree | 750ac0d055e8b05cc56d802b44258c7538356b9e /sql/sql_binlog.cc | |
| parent | 6b570216836c402f4364f2a92292041c926a4627 (diff) | |
| download | mariadb-git-333f794adc1ff447b2245e6aca405df1dec50665.tar.gz | |
BUG#24488 (Valgrind warnings on invalid read in mysql_client_binlog_statement):
Disabling debug printouts for valgrind builds that print unallocated memory.
Diffstat (limited to 'sql/sql_binlog.cc')
| -rw-r--r-- | sql/sql_binlog.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sql/sql_binlog.cc b/sql/sql_binlog.cc index 23ca5330053..732981b58f3 100644 --- a/sql/sql_binlog.cc +++ b/sql/sql_binlog.cc @@ -79,9 +79,15 @@ void mysql_client_binlog_statement(THD* thd) char const *endptr= 0; int bytes_decoded= base64_decode(strptr, coded_len, buf, &endptr); +#ifndef HAVE_purify + /* + This debug printout should not be used for valgrind builds + since it will read from unassigned memory. + */ DBUG_PRINT("info", ("bytes_decoded=%d; strptr=0x%lu; endptr=0x%lu ('%c':%d)", bytes_decoded, strptr, endptr, *endptr, *endptr)); +#endif if (bytes_decoded < 0) { @@ -147,8 +153,14 @@ void mysql_client_binlog_statement(THD* thd) 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)); +#ifndef HAVE_purify + /* + This debug printout should not be used for valgrind builds + since it will read from unassigned memory. + */ DBUG_PRINT("info", ("bytes_decoded=%d; bufptr=0x%lx; buf[EVENT_LEN_OFFSET]=%u", bytes_decoded, bufptr, uint4korr(bufptr+EVENT_LEN_OFFSET))); +#endif ev->thd= thd; if (int err= ev->exec_event(thd->rli_fake)) { |