From 7eb3881bd8c6b5c8dc705558414dbbe444804694 Mon Sep 17 00:00:00 2001
From: unknown <jani@ua141d10.elisa.omakaista.fi>
Date: Thu, 22 Mar 2007 20:32:07 +0200
Subject: Fixed compiler warnings.
mysys/default.c:
Fixed bug.
ndb/src/mgmclient/CommandInterpreter.cpp:
Added parenthesis around the expression.
sql/mysqld.cc:
Fixed compiler warnings.
Added a missing component in options struct (bug).
sql-common/my_time.c:
Removed garbage.
sql/sql_table.cc:
A possible use of a variable uninitialized.
support-files/compiler_warnings.supp:
BitKeeper file /home/my/bk/mysql-4.1-main/support-files/compiler_warnings.supp
---
isam/write.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
(limited to 'isam/write.c')
diff --git a/isam/write.c b/isam/write.c
index f2c0d8dbc45..2147c7cd59e 100644
--- a/isam/write.c
+++ b/isam/write.c
@@ -226,7 +226,7 @@ int _nisam_insert(register N_INFO *info, register N_KEYDEF *keyinfo,
int key_offset;
S_PARAM s_temp;
DBUG_ENTER("_nisam_insert");
- DBUG_PRINT("enter",("key_pos: %lx",key_pos));
+ DBUG_PRINT("enter",("key_pos: 0x%lx", (long) key_pos));
DBUG_EXECUTE("key",_nisam_print_key(DBUG_FILE,keyinfo->seg,key););
nod_flag=test_if_nod(anc_buff);
@@ -243,8 +243,9 @@ int _nisam_insert(register N_INFO *info, register N_KEYDEF *keyinfo,
{
DBUG_PRINT("test",("t_length: %d ref_len: %d",
t_length,s_temp.ref_length));
- DBUG_PRINT("test",("n_ref_len: %d n_length: %d key: %lx",
- s_temp.n_ref_length,s_temp.n_length,s_temp.key));
+ DBUG_PRINT("test",("n_ref_len: %d n_length: %d key: 0x%lx",
+ s_temp.n_ref_length, s_temp.n_length,
+ (long) s_temp.key));
}
#endif
key_offset = (uint)(endpos-key_pos);
@@ -430,7 +431,7 @@ uint _nisam_get_pack_key_length(N_KEYDEF *keyinfo, uint nod_flag, uchar *key_pos
if (*start == *key_pos && diff_flag && start != key_end)
length++; /* One new pos for ref.len */
- DBUG_PRINT("test",("length: %d key_pos: %lx",length,key_pos));
+ DBUG_PRINT("test",("length: %d key_pos: 0x%lx",length,key_pos));
if (n_length != 128)
{ /* Not same key after */
key=start+ref_length;
@@ -597,7 +598,7 @@ _nisam_get_pack_key_length(N_KEYDEF *keyinfo,
if (*start == *key_pos && diff_flag && start != key_end)
length++; /* One new pos for ref.len */
}
- DBUG_PRINT("test",("length: %d key_pos: %lx",length,key_pos));
+ DBUG_PRINT("test",("length: %d key_pos: 0x%lx", length, (long) key_pos));
key=start+ref_length;
while (n_length > 0 && key < key_end && *key == *key_pos)
@@ -696,7 +697,8 @@ uchar *_nisam_find_half_pos(N_INFO *info, N_KEYDEF *keyinfo, uchar *page, uchar
VOID((*keyinfo->get_key)(keyinfo,nod_flag,&page,key));
} while (page < end);
- DBUG_PRINT("exit",("returns: %lx page: %lx half: %lx",lastpos,page,end));
+ DBUG_PRINT("exit",("returns: 0x%lx page: 0x%lx half: 0x%lx",
+ (long) lastpos, (long) page, (long) end));
DBUG_RETURN(lastpos);
} /* _nisam_find_half_pos */
--
cgit v1.2.1