summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <jani@a88-113-38-195.elisa-laajakaista.fi>2007-03-01 10:52:25 +0200
committerunknown <jani@a88-113-38-195.elisa-laajakaista.fi>2007-03-01 10:52:25 +0200
commitc04d5985c1cee79921de5a8ca4b684e82d2c5695 (patch)
treefa6a6bc6cbf21789378fd52e21865af2134e5b59 /sql
parentdef9c0b2367808d6e8f6b9ffe2f82f6465d9642b (diff)
downloadmariadb-git-c04d5985c1cee79921de5a8ca4b684e82d2c5695.tar.gz
Disabled compiler warnings.
sql/ha_archive.cc: Fixed a warning from unused computed value. This block is only used in debug mode and changes nothing. support-files/compiler_warnings.supp: Disabled a warning from BDB.
Diffstat (limited to 'sql')
-rw-r--r--sql/ha_archive.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/ha_archive.cc b/sql/ha_archive.cc
index 730d8b46945..2ee514f29c9 100644
--- a/sql/ha_archive.cc
+++ b/sql/ha_archive.cc
@@ -749,10 +749,12 @@ int ha_archive::write_row(byte *buf)
DBUG_PRINT("archive",("MyPack is %d\n", (*field)->data_length((char*) buf + (*field)->offset())));
if ((*field)->real_type() == MYSQL_TYPE_VARCHAR)
{
+#ifndef DBUG_OFF
uint actual_length= (*field)->data_length((char*) buf + (*field)->offset());
- IF_DBUG(uint offset=) (*field)->offset() + actual_length +
+ uint offset= (*field)->offset() + actual_length +
(actual_length > 255 ? 2 : 1);
DBUG_PRINT("archive",("Offset is %d -> %d\n", actual_length, offset));
+#endif
/*
if ((*field)->pack_length() + (*field)->offset() != offset)
bzero(buf + offset, (size_t)((*field)->pack_length() + (actual_length > 255 ? 2 : 1) - (*field)->data_length));