mirror of
https://github.com/MariaDB/server.git
synced 2026-05-14 19:07:15 +02:00
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.
This commit is contained in:
parent
8c336fbc46
commit
def9c0b236
12 changed files with 114 additions and 33 deletions
|
|
@ -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));
|
||||
/*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue