diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2007-02-28 22:23:35 +0200 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2007-02-28 22:23:35 +0200 |
| commit | def9c0b2367808d6e8f6b9ffe2f82f6465d9642b (patch) | |
| tree | 288ffce0d7e95cc7177686fa96f53632b56e4161 /sql/ha_archive.cc | |
| parent | 8c336fbc46fd3e8d1a7cc073883270c5a2ac3cc8 (diff) | |
| download | mariadb-git-def9c0b2367808d6e8f6b9ffe2f82f6465d9642b.tar.gz | |
Fixed compiler warnings.
client/mysql_upgrade.c:
Fixed problem with mysql_upgrade being dependent
on local my.cnf files and problem with memory not being freed.
client/mysqltest.c:
Changed type to avoid warning.
cmd-line-utils/readline/xmalloc.c:
Fix to avoid warning.
include/my_dbug.h:
To disable parts from code in non-debug more.
sql/field.cc:
Fixed warning.
sql/ha_archive.cc:
Fixed warning.
sql/ha_berkeley.cc:
Added casts to avoid warnings.
sql/ha_ndbcluster.cc:
Fixed warnings.
sql/log.cc:
Added casts to avoid warnings.
sql/slave.cc:
Avoid warning.
sql/sql_repl.cc:
Avoid warning.
support-files/compiler_warnings.supp:
Added disabled warnings to compiler_warnings.supp file.
These are backported mainly from 5.1 suppress file, but there
are some additional new ones.
Diffstat (limited to 'sql/ha_archive.cc')
| -rw-r--r-- | sql/ha_archive.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_archive.cc b/sql/ha_archive.cc index 96b6861007e..730d8b46945 100644 --- a/sql/ha_archive.cc +++ b/sql/ha_archive.cc @@ -750,7 +750,7 @@ int ha_archive::write_row(byte *buf) if ((*field)->real_type() == MYSQL_TYPE_VARCHAR) { uint actual_length= (*field)->data_length((char*) buf + (*field)->offset()); - uint offset= (*field)->offset() + actual_length + + IF_DBUG(uint offset=) (*field)->offset() + actual_length + (actual_length > 255 ? 2 : 1); DBUG_PRINT("archive",("Offset is %d -> %d\n", actual_length, offset)); /* |