Below is the list of changes that have just been committed into a local
5.1 repository of hartmut. When hartmut does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2006-10-22 17:00:54+02:00, hartmut@stripped +61 -0
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
libmysql/libmysql.c@stripped, 2006-10-22 17:00:46+02:00, hartmut@stripped +2 -2
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
libmysqld/libmysqld.c@stripped, 2006-10-22 17:00:46+02:00, hartmut@stripped +1 -1
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
mysys/hash.c@stripped, 2006-10-22 17:00:46+02:00, hartmut@stripped +4 -4
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
mysys/list.c@stripped, 2006-10-22 17:00:46+02:00, hartmut@stripped +1 -1
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
mysys/mf_keycache.c@stripped, 2006-10-22 17:00:46+02:00, hartmut@stripped +4 -4
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
mysys/mf_keycaches.c@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +2 -2
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
mysys/my_alloc.c@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +3 -3
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
mysys/my_compress.c@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +5 -5
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
mysys/my_fopen.c@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +3 -3
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
mysys/my_fstream.c@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +4 -4
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
mysys/my_lib.c@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +1 -1
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
mysys/my_pread.c@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +2 -2
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
mysys/my_read.c@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +1 -1
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
mysys/my_write.c@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +1 -1
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
mysys/safemalloc.c@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +5 -5
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
mysys/thr_lock.c@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +6 -6
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
mysys/tree.c@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +2 -2
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
mysys/typelib.c@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +1 -1
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
sql-common/client.c@stripped, 2006-10-22 17:00:48+02:00, hartmut@stripped +3 -3
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
sql/event_data_objects.cc@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +5 -5
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
sql/event_data_objects.h@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +2 -2
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
sql/event_db_repository.cc@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +1 -1
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
sql/event_queue.cc@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +9 -9
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
sql/event_scheduler.cc@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +5 -5
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
sql/events.cc@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +1 -1
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
sql/ha_ndbcluster.cc@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +10 -10
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
sql/ha_ndbcluster_binlog.cc@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +17 -17
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
sql/ha_partition.cc@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +1 -1
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
sql/handler.cc@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +2 -2
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
sql/item_cmpfunc.cc@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +1 -1
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
sql/sql_binlog.cc@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +2 -2
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
sql/sql_cache.cc@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +4 -4
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
sql/sql_class.cc@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +1 -1
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
sql/sql_partition.cc@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +1 -1
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
sql/strfunc.cc@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +1 -1
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
sql/table.cc@stripped, 2006-10-22 17:00:47+02:00, hartmut@stripped +1 -1
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
sql/unireg.cc@stripped, 2006-10-22 17:00:48+02:00, hartmut@stripped +1 -1
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
storage/federated/ha_federated.cc@stripped, 2006-10-22 17:00:48+02:00, hartmut@stripped +2 -2
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
storage/heap/_check.c@stripped, 2006-10-22 17:00:48+02:00, hartmut@stripped +2 -2
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
storage/heap/hp_delete.c@stripped, 2006-10-22 17:00:48+02:00, hartmut@stripped +2 -2
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
storage/heap/hp_open.c@stripped, 2006-10-22 17:00:48+02:00, hartmut@stripped +2 -2
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
storage/heap/hp_rkey.c@stripped, 2006-10-22 17:00:48+02:00, hartmut@stripped +1 -1
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
storage/heap/hp_rrnd.c@stripped, 2006-10-22 17:00:48+02:00, hartmut@stripped +2 -2
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
storage/heap/hp_write.c@stripped, 2006-10-22 17:00:48+02:00, hartmut@stripped +2 -2
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
storage/myisam/ha_myisam.cc@stripped, 2006-10-22 17:00:48+02:00, hartmut@stripped +1 -1
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
storage/myisam/mi_close.c@stripped, 2006-10-22 17:00:48+02:00, hartmut@stripped +1 -1
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
storage/myisam/mi_delete.c@stripped, 2006-10-22 17:00:48+02:00, hartmut@stripped +2 -2
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
storage/myisam/mi_dynrec.c@stripped, 2006-10-22 17:00:48+02:00, hartmut@stripped +1 -1
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
storage/myisam/mi_keycache.c@stripped, 2006-10-22 17:00:48+02:00, hartmut@stripped +1 -1
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
storage/myisam/mi_write.c@stripped, 2006-10-22 17:00:48+02:00, hartmut@stripped +4 -4
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
storage/ndb/src/common/portlib/NdbMutex.c@stripped, 2006-10-22 17:00:48+02:00, hartmut@stripped +2 -2
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
storage/ndb/src/common/portlib/NdbThread.c@stripped, 2006-10-22 17:00:48+02:00, hartmut@stripped +2 -2
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
storage/ndb/src/mgmsrv/MgmtSrvr.cpp@stripped, 2006-10-22 17:00:48+02:00, hartmut@stripped +1 -1
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
storage/ndb/src/ndbapi/Ndb.cpp@stripped, 2006-10-22 17:00:48+02:00, hartmut@stripped +4 -4
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@stripped, 2006-10-22 17:00:48+02:00, hartmut@stripped +7 -7
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
storage/ndb/src/ndbapi/NdbOperationInt.cpp@stripped, 2006-10-22 17:00:48+02:00, hartmut@stripped +1 -1
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
storage/ndb/src/ndbapi/NdbTransaction.cpp@stripped, 2006-10-22 17:00:48+02:00, hartmut@stripped +1 -1
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
storage/ndb/src/ndbapi/Ndbinit.cpp@stripped, 2006-10-22 17:00:48+02:00, hartmut@stripped +2 -2
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
storage/ndb/src/ndbapi/ObjectMap.hpp@stripped, 2006-10-22 17:00:48+02:00, hartmut@stripped +4 -4
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp@stripped, 2006-10-22 17:00:48+02:00, hartmut@stripped +1 -1
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
vio/viossl.c@stripped, 2006-10-22 17:00:48+02:00, hartmut@stripped +2 -2
%x / %lx -> %p format string changes for pointer arguments (Bug #23529)
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: hartmut
# Host: linux.site
# Root: /home/hartmut/projects/mysql/dev/5.1-maint
--- 1.19/storage/heap/_check.c 2006-10-22 17:01:07 +02:00
+++ 1.20/storage/heap/_check.c 2006-10-22 17:01:07 +02:00
@@ -123,7 +123,7 @@
blength, records))
!= i)
{
- DBUG_PRINT("error",("Record in wrong link: Link %d Record: 0x%lx Record-link %d", i,hash_info->ptr_to_rec,rec_link));
+ DBUG_PRINT("error",("Record in wrong link: Link %d Record: %p Record-link %d", i,hash_info->ptr_to_rec,rec_link));
error=1;
}
else
@@ -180,7 +180,7 @@
key_length, SEARCH_FIND | SEARCH_SAME, not_used))
{
error= 1;
- DBUG_PRINT("error",("Record in wrong link: key: %d Record: 0x%lx\n",
+ DBUG_PRINT("error",("Record in wrong link: key: %d Record: %p\n",
keynr, recpos));
}
else
--- 1.18/storage/heap/hp_delete.c 2006-10-22 17:01:07 +02:00
+++ 1.19/storage/heap/hp_delete.c 2006-10-22 17:01:07 +02:00
@@ -24,7 +24,7 @@
HP_SHARE *share=info->s;
HP_KEYDEF *keydef, *end, *p_lastinx;
DBUG_ENTER("heap_delete");
- DBUG_PRINT("enter",("info: %lx record: 0x%lx",info,record));
+ DBUG_PRINT("enter",("info: %p record: %p",info,record));
test_active(info);
@@ -143,7 +143,7 @@
/* Save for heap_rnext/heap_rprev */
info->current_hash_ptr=last_ptr;
info->current_ptr = last_ptr ? last_ptr->ptr_to_rec : 0;
- DBUG_PRINT("info",("Corrected current_ptr to point at: 0x%lx",
+ DBUG_PRINT("info",("Corrected current_ptr to point at: %p",
info->current_ptr));
}
empty=pos;
--- 1.22/storage/heap/hp_open.c 2006-10-22 17:01:07 +02:00
+++ 1.23/storage/heap/hp_open.c 2006-10-22 17:01:07 +02:00
@@ -63,7 +63,7 @@
#ifndef DBUG_OFF
info->opt_flag= READ_CHECK_USED; /* Check when changing */
#endif
- DBUG_PRINT("exit",("heap: 0x%lx reclength: %d records_in_block: %d",
+ DBUG_PRINT("exit",("heap: %p reclength: %d records_in_block: %d",
info,share->reclength,share->block.records_in_block));
DBUG_RETURN(info);
}
@@ -82,7 +82,7 @@
info= (HP_SHARE*) pos->data;
if (!strcmp(name, info->name))
{
- DBUG_PRINT("exit", ("Old heap_database: 0x%lx",info));
+ DBUG_PRINT("exit", ("Old heap_database: %p",info));
DBUG_RETURN(info);
}
}
--- 1.16/storage/heap/hp_rkey.c 2006-10-22 17:01:07 +02:00
+++ 1.17/storage/heap/hp_rkey.c 2006-10-22 17:01:07 +02:00
@@ -23,7 +23,7 @@
HP_SHARE *share= info->s;
HP_KEYDEF *keyinfo= share->keydef + inx;
DBUG_ENTER("heap_rkey");
- DBUG_PRINT("enter",("base: 0x%lx inx: %d",info,inx));
+ DBUG_PRINT("enter",("base: %p inx: %d",info,inx));
if ((uint) inx >= share->keys)
{
--- 1.9/storage/heap/hp_rrnd.c 2006-10-22 17:01:07 +02:00
+++ 1.10/storage/heap/hp_rrnd.c 2006-10-22 17:01:07 +02:00
@@ -29,7 +29,7 @@
{
HP_SHARE *share=info->s;
DBUG_ENTER("heap_rrnd");
- DBUG_PRINT("enter",("info: 0x%lx pos: %lx",info,pos));
+ DBUG_PRINT("enter",("info: %p pos: %p",info,pos));
info->lastinx= -1;
if (!(info->current_ptr= pos))
@@ -44,7 +44,7 @@
}
info->update=HA_STATE_PREV_FOUND | HA_STATE_NEXT_FOUND | HA_STATE_AKTIV;
memcpy(record,info->current_ptr,(size_t) share->reclength);
- DBUG_PRINT("exit",("found record at 0x%lx",info->current_ptr));
+ DBUG_PRINT("exit",("found record at %p",info->current_ptr));
info->current_hash_ptr=0; /* Can't use rnext */
DBUG_RETURN(0);
} /* heap_rrnd */
--- 1.24/storage/heap/hp_write.c 2006-10-22 17:01:07 +02:00
+++ 1.25/storage/heap/hp_write.c 2006-10-22 17:01:07 +02:00
@@ -138,7 +138,7 @@
pos=info->del_link;
info->del_link= *((byte**) pos);
info->deleted--;
- DBUG_PRINT("exit",("Used old position: 0x%lx",pos));
+ DBUG_PRINT("exit",("Used old position: %p",pos));
DBUG_RETURN(pos);
}
if (!(block_pos=(info->records % info->block.records_in_block)))
@@ -153,7 +153,7 @@
DBUG_RETURN(NULL);
info->data_length+=length;
}
- DBUG_PRINT("exit",("Used new position: %lx",
+ DBUG_PRINT("exit",("Used new position: %p",
(byte*) info->block.level_info[0].last_blocks+block_pos*
info->block.recbuffer));
DBUG_RETURN((byte*) info->block.level_info[0].last_blocks+
--- 1.258/libmysql/libmysql.c 2006-10-22 17:01:07 +02:00
+++ 1.259/libmysql/libmysql.c 2006-10-22 17:01:07 +02:00
@@ -2437,7 +2437,7 @@
{
NET *net= &stmt->mysql->net;
DBUG_ENTER("store_param");
- DBUG_PRINT("enter",("type: %d, buffer:%lx, length: %lu is_null: %d",
+ DBUG_PRINT("enter",("type: %d, buffer:%p, length: %lu is_null: %d",
param->buffer_type,
param->buffer ? param->buffer : "0", *param->length,
*param->is_null));
@@ -3319,7 +3319,7 @@
MYSQL_BIND *param;
DBUG_ENTER("mysql_stmt_send_long_data");
DBUG_ASSERT(stmt != 0);
- DBUG_PRINT("enter",("param no : %d, data : %lx, length : %ld",
+ DBUG_PRINT("enter",("param no : %d, data : %p, length : %ld",
param_number, data, length));
/*
--- 1.21/storage/myisam/mi_close.c 2006-10-22 17:01:07 +02:00
+++ 1.22/storage/myisam/mi_close.c 2006-10-22 17:01:07 +02:00
@@ -28,7 +28,7 @@
int error=0,flag;
MYISAM_SHARE *share=info->s;
DBUG_ENTER("mi_close");
- DBUG_PRINT("enter",("base: %lx reopen: %u locks: %u",
+ DBUG_PRINT("enter",("base: %p reopen: %u locks: %u",
info,(uint) share->reopen, (uint) share->tot_locks));
pthread_mutex_lock(&THR_LOCK_myisam);
--- 1.41/storage/myisam/mi_delete.c 2006-10-22 17:01:07 +02:00
+++ 1.42/storage/myisam/mi_delete.c 2006-10-22 17:01:07 +02:00
@@ -597,7 +597,7 @@
else
{ /* Page is full */
endpos=anc_buff+anc_length;
- DBUG_PRINT("test",("anc_buff: %lx endpos: %lx",anc_buff,endpos));
+ DBUG_PRINT("test",("anc_buff: %p endpos: %p",anc_buff,endpos));
if (keypos != anc_buff+2+key_reflength &&
!_mi_get_last_key(info,keyinfo,anc_buff,anc_key,keypos,&length))
goto err;
@@ -775,7 +775,7 @@
int s_length;
uchar *start;
DBUG_ENTER("remove_key");
- DBUG_PRINT("enter",("keypos: %lx page_end: %lx",keypos,page_end));
+ DBUG_PRINT("enter",("keypos: %p page_end: %p",keypos,page_end));
start=keypos;
if (!(keyinfo->flag &
--- 1.49/storage/myisam/mi_dynrec.c 2006-10-22 17:01:07 +02:00
+++ 1.50/storage/myisam/mi_dynrec.c 2006-10-22 17:01:07 +02:00
@@ -1240,7 +1240,7 @@
err:
my_errno= HA_ERR_WRONG_IN_RECORD;
- DBUG_PRINT("error",("to_end: %lx -> %lx from_end: %lx -> %lx",
+ DBUG_PRINT("error",("to_end: %p -> %p from_end: %p -> %p",
to,to_end,from,from_end));
DBUG_DUMP("from",(byte*) info->rec_buff,info->s->base.min_pack_length);
DBUG_RETURN(MY_FILE_ERROR);
--- 1.60/storage/myisam/mi_write.c 2006-10-22 17:01:07 +02:00
+++ 1.61/storage/myisam/mi_write.c 2006-10-22 17:01:07 +02:00
@@ -474,7 +474,7 @@
uchar *endpos, *prev_key;
MI_KEY_PARAM s_temp;
DBUG_ENTER("_mi_insert");
- DBUG_PRINT("enter",("key_pos: %lx",key_pos));
+ DBUG_PRINT("enter",("key_pos: %p",key_pos));
DBUG_EXECUTE("key",_mi_print_key(DBUG_FILE,keyinfo->seg,key,USE_WHOLE_KEY););
nod_flag=mi_test_if_nod(anc_buff);
@@ -495,7 +495,7 @@
{
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_pos: %lx",
+ DBUG_PRINT("test",("n_ref_len: %d n_length: %d key_pos: %p",
s_temp.n_ref_length,s_temp.n_length,s_temp.key));
}
#endif
@@ -689,7 +689,7 @@
} while (page < end);
*return_key_length=length;
*after_key=page;
- DBUG_PRINT("exit",("returns: %lx page: %lx half: %lx",lastpos,page,end));
+ DBUG_PRINT("exit",("returns: %p page: %p half: %p",lastpos,page,end));
DBUG_RETURN(lastpos);
} /* _mi_find_half_pos */
@@ -744,7 +744,7 @@
}
*return_key_length=last_length;
*after_key=lastpos;
- DBUG_PRINT("exit",("returns: %lx page: %lx end: %lx",prevpos,page,end));
+ DBUG_PRINT("exit",("returns: %p page: %p end: %p",prevpos,page,end));
DBUG_RETURN(prevpos);
} /* _mi_find_last_pos */
--- 1.48/mysys/hash.c 2006-10-22 17:01:07 +02:00
+++ 1.49/mysys/hash.c 2006-10-22 17:01:07 +02:00
@@ -53,7 +53,7 @@
void (*free_element)(void*),uint flags CALLER_INFO_PROTO)
{
DBUG_ENTER("hash_init");
- DBUG_PRINT("enter",("hash: 0x%lx size: %d",hash,size));
+ DBUG_PRINT("enter",("hash: %p size: %d",hash,size));
hash->records=0;
if (my_init_dynamic_array_ci(&hash->array,sizeof(HASH_LINK),size,0))
@@ -109,7 +109,7 @@
void hash_free(HASH *hash)
{
DBUG_ENTER("hash_free");
- DBUG_PRINT("enter",("hash: 0x%lx", hash));
+ DBUG_PRINT("enter",("hash: %p", hash));
hash_free_elements(hash);
hash->free= 0;
@@ -129,7 +129,7 @@
void my_hash_reset(HASH *hash)
{
DBUG_ENTER("my_hash_reset");
- DBUG_PRINT("enter",("hash: 0x%lxd",hash));
+ DBUG_PRINT("enter",("hash: %p",hash));
hash_free_elements(hash);
reset_dynamic(&hash->array);
@@ -644,7 +644,7 @@
if ((rec_link=hash_rec_mask(hash,hash_info,blength,records)) != i)
{
DBUG_PRINT("error",
- ("Record in wrong link at %d: Start %d Record: 0x%lx Record-link %d", idx,i,hash_info->data,rec_link));
+ ("Record in wrong link at %d: Start %d Record: %p Record-link %d", idx,i,hash_info->data,rec_link));
error=1;
}
else
--- 1.10/mysys/list.c 2006-10-22 17:01:07 +02:00
+++ 1.11/mysys/list.c 2006-10-22 17:01:07 +02:00
@@ -28,7 +28,7 @@
LIST *list_add(LIST *root, LIST *element)
{
DBUG_ENTER("list_add");
- DBUG_PRINT("enter",("root: 0x%lx element: 0x%lx", root, element));
+ DBUG_PRINT("enter",("root: %p element: %p", root, element));
if (root)
{
if (root->prev) /* If add in mid of list */
--- 1.60/mysys/mf_keycache.c 2006-10-22 17:01:07 +02:00
+++ 1.61/mysys/mf_keycache.c 2006-10-22 17:01:07 +02:00
@@ -402,8 +402,8 @@
keycache->waiting_for_hash_link.last_thread= NULL;
keycache->waiting_for_block.last_thread= NULL;
DBUG_PRINT("exit",
- ("disk_blocks: %d block_root: 0x%lx hash_entries: %d\
- hash_root: 0x%lx hash_links: %d hash_link_root: 0x%lx",
+ ("disk_blocks: %d block_root: %p hash_entries: %d\
+ hash_root: %p hash_links: %d hash_link_root: %p",
keycache->disk_blocks, keycache->block_root,
keycache->hash_entries, keycache->hash_root,
keycache->hash_links, keycache->hash_link_root));
@@ -621,7 +621,7 @@
void end_key_cache(KEY_CACHE *keycache, my_bool cleanup)
{
DBUG_ENTER("end_key_cache");
- DBUG_PRINT("enter", ("key_cache: 0x%lx", keycache));
+ DBUG_PRINT("enter", ("key_cache: %p", keycache));
if (!keycache->key_cache_inited)
DBUG_VOID_RETURN;
@@ -2546,7 +2546,7 @@
{
int res;
DBUG_ENTER("flush_key_blocks");
- DBUG_PRINT("enter", ("keycache: 0x%lx", keycache));
+ DBUG_PRINT("enter", ("keycache: %p", keycache));
if (keycache->disk_blocks <= 0)
DBUG_RETURN(0);
--- 1.33/mysys/my_alloc.c 2006-10-22 17:01:07 +02:00
+++ 1.34/mysys/my_alloc.c 2006-10-22 17:01:07 +02:00
@@ -48,7 +48,7 @@
uint pre_alloc_size __attribute__((unused)))
{
DBUG_ENTER("init_alloc_root");
- DBUG_PRINT("enter",("root: 0x%lx", mem_root));
+ DBUG_PRINT("enter",("root: %p", mem_root));
mem_root->free= mem_root->used= mem_root->pre_alloc= 0;
mem_root->min_malloc= 32;
mem_root->block_size= block_size - ALLOC_ROOT_MIN_BLOCK_SIZE;
@@ -169,7 +169,7 @@
reg1 USED_MEM *next= 0;
reg2 USED_MEM **prev;
DBUG_ENTER("alloc_root");
- DBUG_PRINT("enter",("root: 0x%lx", mem_root));
+ DBUG_PRINT("enter",("root: %p", mem_root));
DBUG_ASSERT(alloc_root_inited(mem_root));
Size= ALIGN_SIZE(Size);
@@ -328,7 +328,7 @@
{
reg1 USED_MEM *next,*old;
DBUG_ENTER("free_root");
- DBUG_PRINT("enter",("root: 0x%lx flags: %u", root, (uint) MyFlags));
+ DBUG_PRINT("enter",("root: %p flags: %u", root, (uint) MyFlags));
if (!root) /* QQ: Should be deleted */
DBUG_VOID_RETURN; /* purecov: inspected */
--- 1.13/mysys/my_compress.c 2006-10-22 17:01:07 +02:00
+++ 1.14/mysys/my_compress.c 2006-10-22 17:01:07 +02:00
@@ -138,7 +138,7 @@
uint blob_len;
struct frm_blob_struct *blob;
DBUG_ENTER("packfrm");
- DBUG_PRINT("enter", ("data: %x, len: %d", data, len));
+ DBUG_PRINT("enter", ("data: %p, len: %d", data, len));
error= 1;
org_len= len;
@@ -165,7 +165,7 @@
*pack_len= blob_len;
error= 0;
- DBUG_PRINT("exit", ("pack_data: %x, pack_len: %d", *pack_data, *pack_len));
+ DBUG_PRINT("exit", ("pack_data: %p, pack_len: %d", *pack_data, *pack_len));
err:
DBUG_RETURN(error);
@@ -182,7 +182,7 @@
out:unpack_data Reference to the pointer to the unpacked frm data
out:unpack_len Length of unpacked frm file data
- RETURN VALUES¨
+ RETURN VALUES¨
0 Success
>0 Failure
*/
@@ -194,7 +194,7 @@
byte *data;
ulong complen, orglen, ver;
DBUG_ENTER("unpackfrm");
- DBUG_PRINT("enter", ("pack_data: %x", pack_data));
+ DBUG_PRINT("enter", ("pack_data: %p", pack_data));
complen= uint4korr((char*)&blob->head.complen);
orglen= uint4korr((char*)&blob->head.orglen);
@@ -220,7 +220,7 @@
*unpack_data= data;
*unpack_len= complen;
- DBUG_PRINT("exit", ("frmdata: %x, len: %d", *unpack_data, *unpack_len));
+ DBUG_PRINT("exit", ("frmdata: %p, len: %d", *unpack_data, *unpack_len));
DBUG_RETURN(0);
}
#endif /* HAVE_COMPRESS */
--- 1.15/mysys/my_fopen.c 2006-10-22 17:01:07 +02:00
+++ 1.16/mysys/my_fopen.c 2006-10-22 17:01:07 +02:00
@@ -79,7 +79,7 @@
my_stream_opened++;
my_file_info[fileno(fd)].type = STREAM_BY_FOPEN;
pthread_mutex_unlock(&THR_LOCK_open);
- DBUG_PRINT("exit",("stream: 0x%lx",fd));
+ DBUG_PRINT("exit",("stream: %p",fd));
DBUG_RETURN(fd);
}
pthread_mutex_unlock(&THR_LOCK_open);
@@ -103,7 +103,7 @@
{
int err,file;
DBUG_ENTER("my_fclose");
- DBUG_PRINT("my",("stream: 0x%lx MyFlags: %d",fd, MyFlags));
+ DBUG_PRINT("my",("stream: %p MyFlags: %d",fd, MyFlags));
pthread_mutex_lock(&THR_LOCK_open);
file=fileno(fd);
@@ -163,7 +163,7 @@
pthread_mutex_unlock(&THR_LOCK_open);
}
- DBUG_PRINT("exit",("stream: 0x%lx",fd));
+ DBUG_PRINT("exit",("stream: %p",fd));
DBUG_RETURN(fd);
} /* my_fdopen */
--- 1.8/mysys/my_fstream.c 2006-10-22 17:01:07 +02:00
+++ 1.9/mysys/my_fstream.c 2006-10-22 17:01:07 +02:00
@@ -39,7 +39,7 @@
{
uint readbytes;
DBUG_ENTER("my_fread");
- DBUG_PRINT("my",("stream: 0x%lx Buffer: 0x%lx Count: %u MyFlags: %d",
+ DBUG_PRINT("my",("stream: %p Buffer: %p Count: %u MyFlags: %d",
stream, Buffer, Count, MyFlags));
if ((readbytes = (uint) fread(Buffer,sizeof(char),(size_t) Count,stream))
@@ -80,7 +80,7 @@
uint errors;
#endif
DBUG_ENTER("my_fwrite");
- DBUG_PRINT("my",("stream: 0x%lx Buffer: 0x%lx Count: %u MyFlags: %d",
+ DBUG_PRINT("my",("stream: %p Buffer: %p Count: %u MyFlags: %d",
stream, Buffer, Count, MyFlags));
#if !defined(NO_BACKGROUND) && defined(USE_MY_STREAM)
@@ -152,7 +152,7 @@
myf MyFlags __attribute__((unused)))
{
DBUG_ENTER("my_fseek");
- DBUG_PRINT("my",("stream: 0x%lx pos: %lu whence: %d MyFlags: %d",
+ DBUG_PRINT("my",("stream: %p pos: %lu whence: %d MyFlags: %d",
stream, pos, whence, MyFlags));
DBUG_RETURN(fseek(stream, (off_t) pos, whence) ?
MY_FILEPOS_ERROR : (my_off_t) ftell(stream));
@@ -166,7 +166,7 @@
{
off_t pos;
DBUG_ENTER("my_ftell");
- DBUG_PRINT("my",("stream: 0x%lx MyFlags: %d",stream, MyFlags));
+ DBUG_PRINT("my",("stream: %p MyFlags: %d",stream, MyFlags));
pos=ftell(stream);
DBUG_PRINT("exit",("ftell: %lu",(ulong) pos));
DBUG_RETURN((my_off_t) pos);
--- 1.27/mysys/my_lib.c 2006-10-22 17:01:07 +02:00
+++ 1.28/mysys/my_lib.c 2006-10-22 17:01:07 +02:00
@@ -528,7 +528,7 @@
{
int m_used;
DBUG_ENTER("my_stat");
- DBUG_PRINT("my", ("path: '%s', stat_area: 0x%lx, MyFlags: %d", path,
+ DBUG_PRINT("my", ("path: '%s', stat_area: %p, MyFlags: %d", path,
(byte *) stat_area, my_flags));
if ((m_used= (stat_area == NULL)))
--- 1.15/mysys/my_pread.c 2006-10-22 17:01:07 +02:00
+++ 1.16/mysys/my_pread.c 2006-10-22 17:01:07 +02:00
@@ -29,7 +29,7 @@
uint readbytes;
int error= 0;
DBUG_ENTER("my_pread");
- DBUG_PRINT("my",("Fd: %d Seek: %lu Buffer: 0x%lx Count: %u MyFlags: %d",
+ DBUG_PRINT("my",("Fd: %d Seek: %lu Buffer: %p Count: %u MyFlags: %d",
Filedes, (ulong) offset, Buffer, Count, MyFlags));
for (;;)
@@ -109,7 +109,7 @@
uint writenbytes,errors;
ulong written;
DBUG_ENTER("my_pwrite");
- DBUG_PRINT("my",("Fd: %d Seek: %lu Buffer: 0x%lx Count: %d MyFlags: %d",
+ DBUG_PRINT("my",("Fd: %d Seek: %lu Buffer: %p Count: %d MyFlags: %d",
Filedes, (ulong) offset,Buffer, Count, MyFlags));
errors=0; written=0L;
--- 1.10/mysys/my_read.c 2006-10-22 17:01:07 +02:00
+++ 1.11/mysys/my_read.c 2006-10-22 17:01:07 +02:00
@@ -38,7 +38,7 @@
{
uint readbytes, save_count;
DBUG_ENTER("my_read");
- DBUG_PRINT("my",("Fd: %d Buffer: 0x%lx Count: %u MyFlags: %d",
+ DBUG_PRINT("my",("Fd: %d Buffer: %p Count: %u MyFlags: %d",
Filedes, Buffer, Count, MyFlags));
save_count= Count;
--- 1.12/mysys/my_write.c 2006-10-22 17:01:08 +02:00
+++ 1.13/mysys/my_write.c 2006-10-22 17:01:08 +02:00
@@ -26,7 +26,7 @@
uint writenbytes,errors;
ulong written;
DBUG_ENTER("my_write");
- DBUG_PRINT("my",("Fd: %d Buffer: 0x%lx Count: %d MyFlags: %d",
+ DBUG_PRINT("my",("Fd: %d Buffer: %p Count: %d MyFlags: %d",
Filedes, Buffer, Count, MyFlags));
errors=0; written=0L;
--- 1.27/mysys/safemalloc.c 2006-10-22 17:01:08 +02:00
+++ 1.28/mysys/safemalloc.c 2006-10-22 17:01:08 +02:00
@@ -194,7 +194,7 @@
if ((MyFlags & MY_ZEROFILL) || !sf_malloc_quick)
bfill(data, size, (char) (MyFlags & MY_ZEROFILL ? 0 : ALLOC_VAL));
/* Return a pointer to the real data */
- DBUG_PRINT("exit",("ptr: 0x%lx", data));
+ DBUG_PRINT("exit",("ptr: %p", data));
if (sf_min_adress > data)
sf_min_adress= data;
if (sf_max_adress < data)
@@ -259,7 +259,7 @@
{
struct st_irem *irem;
DBUG_ENTER("_myfree");
- DBUG_PRINT("enter",("ptr: 0x%lx", ptr));
+ DBUG_PRINT("enter",("ptr: %p", ptr));
if (!sf_malloc_quick)
(void) _sanity (filename, lineno);
@@ -409,7 +409,7 @@
(void) fflush(file);
}
DBUG_PRINT("safe",
- ("%6u bytes at 0x%09lx, allocated at line %4d in '%s'",
+ ("%6u bytes at %p, allocated at line %4d in '%s'",
irem->datasize, data, irem->linenum, irem->filename));
irem= irem->next;
}
@@ -446,7 +446,7 @@
irem->filename, irem->linenum);
fprintf(stderr, " discovered at %s:%d\n", filename, lineno);
(void) fflush(stderr);
- DBUG_PRINT("safe",("Underrun at 0x%lx, allocated at %s:%d",
+ DBUG_PRINT("safe",("Underrun at %p, allocated at %s:%d",
data, irem->filename, irem->linenum));
flag=1;
}
@@ -462,7 +462,7 @@
irem->filename, irem->linenum);
fprintf(stderr, " discovered at '%s:%d'\n", filename, lineno);
(void) fflush(stderr);
- DBUG_PRINT("safe",("Overrun at 0x%lx, allocated at %s:%d",
+ DBUG_PRINT("safe",("Overrun at %p, allocated at %s:%d",
data,
irem->filename,
irem->linenum));
--- 1.53/mysys/thr_lock.c 2006-10-22 17:01:08 +02:00
+++ 1.54/mysys/thr_lock.c 2006-10-22 17:01:08 +02:00
@@ -482,7 +482,7 @@
data->type=lock_type;
data->owner= owner; /* Must be reset ! */
VOID(pthread_mutex_lock(&lock->mutex));
- DBUG_PRINT("lock",("data: 0x%lx thread: 0x%lx lock: 0x%lx type: %d",
+ DBUG_PRINT("lock",("data: %p thread: 0x%lx lock: %p type: %d",
data, data->owner->info->thread_id,
lock, (int) lock_type));
check_locks(lock,(uint) lock_type <= (uint) TL_READ_NO_INSERT ?
@@ -739,7 +739,7 @@
THR_LOCK *lock=data->lock;
enum thr_lock_type lock_type=data->type;
DBUG_ENTER("thr_unlock");
- DBUG_PRINT("lock",("data: 0x%lx thread: 0x%lx lock: 0x%lx",
+ DBUG_PRINT("lock",("data: %p thread: 0x%lx lock: %p",
data, data->owner->info->thread_id, lock));
pthread_mutex_lock(&lock->mutex);
check_locks(lock,"start of release lock",0);
@@ -913,7 +913,7 @@
{
THR_LOCK_DATA **pos,**end;
DBUG_ENTER("thr_multi_lock");
- DBUG_PRINT("lock",("data: 0x%lx count: %d",data,count));
+ DBUG_PRINT("lock",("data: %p count: %d",data,count));
if (count > 1)
sort_locks(data,count);
/* lock everything */
@@ -986,12 +986,12 @@
{
THR_LOCK_DATA **pos,**end;
DBUG_ENTER("thr_multi_unlock");
- DBUG_PRINT("lock",("data: 0x%lx count: %d",data,count));
+ DBUG_PRINT("lock",("data: %p count: %d",data,count));
for (pos=data,end=data+count; pos < end ; pos++)
{
#ifdef MAIN
- printf("Thread: %s Rel lock: 0x%lx type: %d\n",
+ printf("Thread: %s Rel lock: %p type: %d\n",
my_thread_name(), (long) pos[0]->lock, pos[0]->type);
fflush(stdout);
#endif
@@ -999,7 +999,7 @@
thr_unlock(*pos);
else
{
- DBUG_PRINT("lock",("Free lock: data: 0x%lx thread: %ld lock: 0x%lx",
+ DBUG_PRINT("lock",("Free lock: data: %p thread: %ld lock: %p",
*pos, (*pos)->owner->info->thread_id, (*pos)->lock));
}
}
--- 1.29/mysys/tree.c 2006-10-22 17:01:08 +02:00
+++ 1.30/mysys/tree.c 2006-10-22 17:01:08 +02:00
@@ -89,7 +89,7 @@
tree_element_free free_element, void *custom_arg)
{
DBUG_ENTER("init_tree");
- DBUG_PRINT("enter",("tree: 0x%lx size: %d",tree,size));
+ DBUG_PRINT("enter",("tree: %p size: %d",tree,size));
if (default_alloc_size < DEFAULT_ALLOC_SIZE)
default_alloc_size= DEFAULT_ALLOC_SIZE;
@@ -137,7 +137,7 @@
static void free_tree(TREE *tree, myf free_flags)
{
DBUG_ENTER("free_tree");
- DBUG_PRINT("enter",("tree: 0x%lx",tree));
+ DBUG_PRINT("enter",("tree: %p",tree));
if (tree->root) /* If initialized */
{
--- 1.13/mysys/typelib.c 2006-10-22 17:01:08 +02:00
+++ 1.14/mysys/typelib.c 2006-10-22 17:01:08 +02:00
@@ -49,7 +49,7 @@
reg1 my_string i;
reg2 const char *j;
DBUG_ENTER("find_type");
- DBUG_PRINT("enter",("x: '%s' lib: 0x%lx",x,typelib));
+ DBUG_PRINT("enter",("x: '%s' lib: %p",x,typelib));
if (!typelib->count)
{
--- 1.198/storage/myisam/ha_myisam.cc 2006-10-22 17:01:08 +02:00
+++ 1.199/storage/myisam/ha_myisam.cc 2006-10-22 17:01:08 +02:00
@@ -1584,7 +1584,7 @@
}
}
}
- DBUG_PRINT("loop",("found: 0x%lx recpos: %d minpos: %d length: %d",
+ DBUG_PRINT("loop",("found: %p recpos: %d minpos: %d length: %d",
found,recpos,minpos,length));
if (recpos != minpos)
{ // Reserved space (Null bits?)
--- 1.275/sql/handler.cc 2006-10-22 17:01:08 +02:00
+++ 1.276/sql/handler.cc 2006-10-22 17:01:08 +02:00
@@ -1519,7 +1519,7 @@
int error;
DBUG_ENTER("handler::ha_open");
DBUG_PRINT("enter",
- ("name: %s db_type: %d db_stat: %d mode: %d lock_test: %d",
+ ("name: %s db_type: %p db_stat: %d mode: %d lock_test: %d",
name, table_share->db_type, table_arg->db_stat, mode,
test_if_locked));
@@ -1934,7 +1934,7 @@
void handler::column_bitmaps_signal()
{
DBUG_ENTER("column_bitmaps_signal");
- DBUG_PRINT("info", ("read_set: 0x%lx write_set: 0x%lx", table->read_set,
+ DBUG_PRINT("info", ("read_set: %p write_set: %p", table->read_set,
table->write_set));
DBUG_VOID_RETURN;
}
--- 1.224/sql/item_cmpfunc.cc 2006-10-22 17:01:08 +02:00
+++ 1.225/sql/item_cmpfunc.cc 2006-10-22 17:01:08 +02:00
@@ -2224,7 +2224,7 @@
cmp_item_row::~cmp_item_row()
{
DBUG_ENTER("~cmp_item_row");
- DBUG_PRINT("enter",("this: 0x%lx", this));
+ DBUG_PRINT("enter",("this: %p", this));
if (comparators)
{
for (uint i= 0; i < n; i++)
--- 1.98/sql/sql_cache.cc 2006-10-22 17:01:08 +02:00
+++ 1.99/sql/sql_cache.cc 2006-10-22 17:01:08 +02:00
@@ -522,7 +522,7 @@
res=0; wri = 0; len = 0;
my_rwlock_init(&lock, NULL);
lock_writing();
- DBUG_PRINT("qcache", ("inited & locked query for block 0x%lx",
+ DBUG_PRINT("qcache", ("inited & locked query for block %p",
((byte*) this)-ALIGN_SIZE(sizeof(Query_cache_block))));
DBUG_VOID_RETURN;
}
@@ -531,7 +531,7 @@
void Query_cache_query::unlock_n_destroy()
{
DBUG_ENTER("Query_cache_query::unlock_n_destroy");
- DBUG_PRINT("qcache", ("destroyed & unlocked query for block 0x%lx",
+ DBUG_PRINT("qcache", ("destroyed & unlocked query for block %p",
((byte*)this)-ALIGN_SIZE(sizeof(Query_cache_block))));
/*
The following call is not needed on system where one can destroy an
@@ -2033,7 +2033,7 @@
Query_cache_block *query_block)
{
DBUG_ENTER("Query_cache::append_result_data");
- DBUG_PRINT("qcache", ("append %lu bytes to 0x%lx query",
+ DBUG_PRINT("qcache", ("append %lu bytes to %p query",
data_len, query_block));
if (query_block->query()->add(data_len) > query_cache_limit)
@@ -3877,7 +3877,7 @@
}
default:
DBUG_PRINT("error",
- ("block 0x%lx have incorrect type %u",
+ ("block %p have incorrect type %u",
block, block->type));
result = 1;
}
--- 1.295/sql/sql_class.cc 2006-10-22 17:01:08 +02:00
+++ 1.296/sql/sql_class.cc 2006-10-22 17:01:08 +02:00
@@ -552,7 +552,7 @@
void THD::awake(THD::killed_state state_to_set)
{
DBUG_ENTER("THD::awake");
- DBUG_PRINT("enter", ("this=0x%lx", this));
+ DBUG_PRINT("enter", ("this=%p", this));
THD_CHECK_SENTRY(this);
safe_mutex_assert_owner(&LOCK_delete);
--- 1.243/sql/table.cc 2006-10-22 17:01:08 +02:00
+++ 1.244/sql/table.cc 2006-10-22 17:01:08 +02:00
@@ -1329,7 +1329,7 @@
byte *record, *bitmaps;
Field **field_ptr;
DBUG_ENTER("open_table_from_share");
- DBUG_PRINT("enter",("name: '%s.%s' form: 0x%lx", share->db.str,
+ DBUG_PRINT("enter",("name: '%s.%s' form: %p", share->db.str,
share->table_name.str, outparam));
error= 1;
--- 1.87/sql/unireg.cc 2006-10-22 17:01:08 +02:00
+++ 1.88/sql/unireg.cc 2006-10-22 17:01:08 +02:00
@@ -469,7 +469,7 @@
int2store(pos+6, key->block_size);
pos+=8;
key_parts+=key->key_parts;
- DBUG_PRINT("loop",("flags: %d key_parts: %d at 0x%lx",
+ DBUG_PRINT("loop",("flags: %d key_parts: %d at %p",
key->flags,key->key_parts,
key->key_part));
for (key_part=key->key_part,key_part_end=key_part+key->key_parts ;
--- 1.65/sql/events.cc 2006-10-22 17:01:08 +02:00
+++ 1.66/sql/events.cc 2006-10-22 17:01:08 +02:00
@@ -858,7 +858,7 @@
bool ret= FALSE;
DBUG_ENTER("Events::check_system_tables");
- DBUG_PRINT("enter", ("thd=0x%lx", thd));
+ DBUG_PRINT("enter", ("thd=%p", thd));
thd->reset_n_backup_open_tables_state(&backup);
--- 1.17/sql/event_db_repository.cc 2006-10-22 17:01:08 +02:00
+++ 1.18/sql/event_db_repository.cc 2006-10-22 17:01:08 +02:00
@@ -958,7 +958,7 @@
Open_tables_state backup;
DBUG_ENTER("Event_db_repository::load_named_event");
- DBUG_PRINT("enter",("thd=0x%lx name:%*s",thd, name.length, name.str));
+ DBUG_PRINT("enter",("thd=%p name:%*s",thd, name.length, name.str));
thd->reset_n_backup_open_tables_state(&backup);
--- 1.18/sql/event_queue.cc 2006-10-22 17:01:08 +02:00
+++ 1.19/sql/event_queue.cc 2006-10-22 17:01:08 +02:00
@@ -143,7 +143,7 @@
struct event_queue_param *event_queue_param_value= NULL;
DBUG_ENTER("Event_queue::init_queue");
- DBUG_PRINT("enter", ("this=0x%lx", this));
+ DBUG_PRINT("enter", ("this=%p", this));
LOCK_QUEUE_DATA();
db_repository= db_repo;
@@ -218,7 +218,7 @@
int res;
Event_queue_element *new_element;
DBUG_ENTER("Event_queue::create_event");
- DBUG_PRINT("enter", ("thd=0x%lx et=%s.%s",thd, dbname.str, name.str));
+ DBUG_PRINT("enter", ("thd=%p et=%s.%s",thd, dbname.str, name.str));
new_element= new Event_queue_element();
res= db_repository->load_named_event(thd, dbname, name, new_element);
@@ -229,7 +229,7 @@
new_element->compute_next_execution_time();
LOCK_QUEUE_DATA();
- DBUG_PRINT("info", ("new event in the queue 0x%lx", new_element));
+ DBUG_PRINT("info", ("new event in the queue %p", new_element));
queue_insert_safe(&queue, (byte *) new_element);
dbug_dump_queue(thd->query_start());
pthread_cond_broadcast(&COND_queue_state);
@@ -264,7 +264,7 @@
Event_queue_element *new_element;
DBUG_ENTER("Event_queue::update_event");
- DBUG_PRINT("enter", ("thd=0x%lx et=[%s.%s]", thd, dbname.str, name.str));
+ DBUG_PRINT("enter", ("thd=%p et=[%s.%s]", thd, dbname.str, name.str));
new_element= new Event_queue_element();
@@ -294,7 +294,7 @@
/* If not disabled event */
if (new_element)
{
- DBUG_PRINT("info", ("new event in the Q 0x%lx", new_element));
+ DBUG_PRINT("info", ("new event in the Q %p", new_element));
queue_insert_safe(&queue, (byte *) new_element);
pthread_cond_broadcast(&COND_queue_state);
}
@@ -322,7 +322,7 @@
Event_queue::drop_event(THD *thd, LEX_STRING dbname, LEX_STRING name)
{
DBUG_ENTER("Event_queue::drop_event");
- DBUG_PRINT("enter", ("thd=0x%lx db=%s name=%s", thd, dbname.str, name.str));
+ DBUG_PRINT("enter", ("thd=%p db=%s name=%s", thd, dbname.str, name.str));
LOCK_QUEUE_DATA();
find_n_remove_event(dbname, name);
@@ -484,7 +484,7 @@
bool clean_the_queue= TRUE;
DBUG_ENTER("Event_queue::load_events_from_db");
- DBUG_PRINT("enter", ("thd=0x%lx", thd));
+ DBUG_PRINT("enter", ("thd=%p", thd));
if ((ret= db_repository->open_event_table(thd, TL_READ, &table)))
{
@@ -663,7 +663,7 @@
for (i = 0; i < queue.elements; i++)
{
et= ((Event_queue_element*)queue_element(&queue, i));
- DBUG_PRINT("info",("et=0x%lx db=%s name=%s",et, et->dbname.str, et->name.str));
+ DBUG_PRINT("info",("et=%p db=%s name=%s",et, et->dbname.str, et->name.str));
DBUG_PRINT("info", ("exec_at=%llu starts=%llu ends=%llu execs_so_far=%u"
" expr=%lld et.exec_at=%d now=%d (et.exec_at - now)=%d if=%d",
TIME_to_ulonglong_datetime(&et->execute_at),
@@ -812,7 +812,7 @@
if (to_free)
delete top;
- DBUG_PRINT("info", ("returning %d. et_new=0x%lx abstime.tv_sec=%d ",
+ DBUG_PRINT("info", ("returning %d. et_new=%p abstime.tv_sec=%d ",
ret, *job_data, abstime? abstime->tv_sec:0));
if (*job_data)
--- 1.27/sql/event_scheduler.cc 2006-10-22 17:01:08 +02:00
+++ 1.28/sql/event_scheduler.cc 2006-10-22 17:01:08 +02:00
@@ -265,7 +265,7 @@
if (!post_init_event_thread(thd))
{
DBUG_PRINT("info", ("Baikonur, time is %d, BURAN reporting and operational."
- "THD=0x%lx", time(NULL), thd));
+ "THD=%p", time(NULL), thd));
sql_print_information("SCHEDULER: [%s.%s of %s] executing in thread %lu. "
"Execution %u",
@@ -400,7 +400,7 @@
scheduler_thd= new_thd;
DBUG_PRINT("info", ("Setting state go RUNNING"));
state= RUNNING;
- DBUG_PRINT("info", ("Forking new thread for scheduduler. THD=0x%lx", new_thd));
+ DBUG_PRINT("info", ("Forking new thread for scheduduler. THD=%p", new_thd));
if (pthread_create(&th, &connection_attrib, event_scheduler_thread,
(void*)scheduler_param_value))
{
@@ -463,7 +463,7 @@
break;
}
- DBUG_PRINT("info", ("get_top returned job_data=0x%lx", job_data));
+ DBUG_PRINT("info", ("get_top returned job_data=%p", job_data));
if (job_data)
{
if ((res= execute_top(thd, job_data)))
@@ -522,7 +522,7 @@
++started_events;
- DBUG_PRINT("info", ("Launch succeeded. BURAN is in THD=0x%lx", new_thd));
+ DBUG_PRINT("info", ("Launch succeeded. BURAN is in THD=%p", new_thd));
DBUG_RETURN(FALSE);
error:
@@ -581,7 +581,7 @@
{
THD *thd= current_thd;
DBUG_ENTER("Event_scheduler::stop");
- DBUG_PRINT("enter", ("thd=0x%lx", current_thd));
+ DBUG_PRINT("enter", ("thd=%p", current_thd));
LOCK_DATA();
DBUG_PRINT("info", ("state before action %s", scheduler_states_names[state]));
--- 1.77/sql/event_data_objects.cc 2006-10-22 17:01:08 +02:00
+++ 1.78/sql/event_data_objects.cc 2006-10-22 17:01:08 +02:00
@@ -124,7 +124,7 @@
Event_parse_data::init_body(THD *thd)
{
DBUG_ENTER("Event_parse_data::init_body");
- DBUG_PRINT("info", ("body=[%s] body_begin=0x%lx end=0x%lx", body_begin,
+ DBUG_PRINT("info", ("body=[%s] body_begin=%p end=%p", body_begin,
body_begin, thd->lex->ptr));
body.length= thd->lex->ptr - body_begin;
@@ -536,7 +536,7 @@
{
bool ret;
DBUG_ENTER("Event_parse_data::check_parse_data");
- DBUG_PRINT("info", ("execute_at=0x%lx expr=0x%lx starts=0x%lx ends=0x%lx",
+ DBUG_PRINT("info", ("execute_at=%p expr=%p starts=%p ends=%p",
item_execute_at, item_expression, item_starts, item_ends));
init_name(thd, identifier);
@@ -564,8 +564,8 @@
int definer_host_len;
DBUG_ENTER("Event_parse_data::init_definer");
- DBUG_PRINT("info",("init definer_user thd->mem_root=0x%lx "
- "thd->sec_ctx->priv_user=0x%lx", thd->mem_root,
+ DBUG_PRINT("info",("init definer_user thd->mem_root=%p "
+ "thd->sec_ctx->priv_user=%p", thd->mem_root,
thd->security_ctx->priv_user));
definer_user_len= strlen(thd->security_ctx->priv_user);
@@ -1170,7 +1170,7 @@
int tmp;
DBUG_ENTER("Event_queue_element::compute_next_execution_time");
- DBUG_PRINT("enter", ("starts=%llu ends=%llu last_executed=%llu this=0x%lx",
+ DBUG_PRINT("enter", ("starts=%llu ends=%llu last_executed=%llu this=%p",
TIME_to_ulonglong_datetime(&starts),
TIME_to_ulonglong_datetime(&ends),
TIME_to_ulonglong_datetime(&last_executed), this));
--- 1.13/sql/event_data_objects.h 2006-10-22 17:01:08 +02:00
+++ 1.14/sql/event_data_objects.h 2006-10-22 17:01:08 +02:00
@@ -111,14 +111,14 @@
void *p;
DBUG_ENTER("Event_queue_element::new(size)");
p= my_malloc(size, MYF(0));
- DBUG_PRINT("info", ("alloc_ptr=0x%lx", p));
+ DBUG_PRINT("info", ("alloc_ptr=%p", p));
DBUG_RETURN(p);
}
static void operator delete(void *ptr, size_t size)
{
DBUG_ENTER("Event_queue_element::delete(ptr,size)");
- DBUG_PRINT("enter", ("free_ptr=0x%lx", ptr));
+ DBUG_PRINT("enter", ("free_ptr=%p", ptr));
TRASH(ptr, size);
my_free((gptr) ptr, MYF(0));
DBUG_VOID_RETURN;
--- 1.113/sql-common/client.c 2006-10-22 17:01:08 +02:00
+++ 1.114/sql-common/client.c 2006-10-22 17:01:08 +02:00
@@ -865,7 +865,7 @@
mysql_free_result(MYSQL_RES *result)
{
DBUG_ENTER("mysql_free_result");
- DBUG_PRINT("enter",("mysql_res: %lx",result));
+ DBUG_PRINT("enter",("mysql_res: %p",result));
if (result)
{
MYSQL *mysql= result->handle;
@@ -2319,7 +2319,7 @@
goto error;
#endif
- DBUG_PRINT("exit",("Mysql handler: %lx",mysql));
+ DBUG_PRINT("exit",("Mysql handler: %p",mysql));
reset_sigpipe(mysql);
DBUG_RETURN(mysql);
@@ -2692,7 +2692,7 @@
mysql_real_query(MYSQL *mysql, const char *query, ulong length)
{
DBUG_ENTER("mysql_real_query");
- DBUG_PRINT("enter",("handle: %lx",mysql));
+ DBUG_PRINT("enter",("handle: %p",mysql));
DBUG_PRINT("query",("Query = '%-.4096s'",query));
if (mysql_send_query(mysql,query,length))
--- 1.11/storage/myisam/mi_keycache.c 2006-10-22 17:01:08 +02:00
+++ 1.12/storage/myisam/mi_keycache.c 2006-10-22 17:01:08 +02:00
@@ -54,7 +54,7 @@
int error= 0;
MYISAM_SHARE* share= info->s;
DBUG_ENTER("mi_assign_to_key_cache");
- DBUG_PRINT("enter",("old_key_cache_handle: %lx new_key_cache_handle: %lx",
+ DBUG_PRINT("enter",("old_key_cache_handle: %p new_key_cache_handle: %p",
share->key_cache, key_cache));
/*
--- 1.3/sql/sql_binlog.cc 2006-10-22 17:01:08 +02:00
+++ 1.4/sql/sql_binlog.cc 2006-10-22 17:01:08 +02:00
@@ -145,9 +145,9 @@
bufptr += event_len;
DBUG_PRINT("info",("ev->get_type_code()=%d", ev->get_type_code()));
- DBUG_PRINT("info",("bufptr+EVENT_TYPE_OFFSET=0x%lx",
+ DBUG_PRINT("info",("bufptr+EVENT_TYPE_OFFSET=%p",
bufptr+EVENT_TYPE_OFFSET));
- DBUG_PRINT("info", ("bytes_decoded=%d; bufptr=0x%lx; buf[EVENT_LEN_OFFSET]=%u",
+ DBUG_PRINT("info", ("bytes_decoded=%d; bufptr=%p; buf[EVENT_LEN_OFFSET]=%u",
bytes_decoded, bufptr, uint4korr(bufptr+EVENT_LEN_OFFSET)));
ev->thd= thd;
if (int err= ev->exec_event(thd->rli_fake))
--- 1.10/storage/ndb/src/common/portlib/NdbMutex.c 2006-10-22 17:01:08 +02:00
+++ 1.11/storage/ndb/src/common/portlib/NdbMutex.c 2006-10-22 17:01:08 +02:00
@@ -28,7 +28,7 @@
DBUG_ENTER("NdbMutex_Create");
pNdbMutex = (NdbMutex*)NdbMem_Allocate(sizeof(NdbMutex));
- DBUG_PRINT("info",("NdbMem_Allocate 0x%lx",pNdbMutex));
+ DBUG_PRINT("info",("NdbMem_Allocate %p",pNdbMutex));
if (pNdbMutex == NULL)
DBUG_RETURN(NULL);
@@ -50,7 +50,7 @@
result = pthread_mutex_destroy(p_mutex);
- DBUG_PRINT("info",("NdbMem_Free 0x%lx",p_mutex));
+ DBUG_PRINT("info",("NdbMem_Free %p",p_mutex));
NdbMem_Free(p_mutex);
DBUG_RETURN(result);
--- 1.31/storage/ndb/src/common/portlib/NdbThread.c 2006-10-22 17:01:08 +02:00
+++ 1.32/storage/ndb/src/common/portlib/NdbThread.c 2006-10-22 17:01:08 +02:00
@@ -142,7 +142,7 @@
}
pthread_attr_destroy(&thread_attr);
- DBUG_PRINT("exit",("ret: %lx", tmpThread));
+ DBUG_PRINT("exit",("ret: %p", tmpThread));
DBUG_RETURN(tmpThread);
}
@@ -151,7 +151,7 @@
{
DBUG_ENTER("NdbThread_Destroy");
if (*p_thread != NULL){
- DBUG_PRINT("enter",("*p_thread: %lx", * p_thread));
+ DBUG_PRINT("enter",("*p_thread: %p", * p_thread));
free(* p_thread);
* p_thread = 0;
}
--- 1.109/storage/ndb/src/mgmsrv/MgmtSrvr.cpp 2006-10-22 17:01:08 +02:00
+++ 1.110/storage/ndb/src/mgmsrv/MgmtSrvr.cpp 2006-10-22 17:01:08 +02:00
@@ -2075,7 +2075,7 @@
int log_event)
{
DBUG_ENTER("MgmtSrvr::alloc_node_id");
- DBUG_PRINT("enter", ("nodeid=%d, type=%d, client_addr=%d",
+ DBUG_PRINT("enter", ("nodeid=%d, type=%d, client_addr=%p",
*nodeId, type, client_addr));
if (g_no_nodeid_checks) {
if (*nodeId == 0) {
--- 1.79/storage/ndb/src/ndbapi/Ndb.cpp 2006-10-22 17:01:08 +02:00
+++ 1.80/storage/ndb/src/ndbapi/Ndb.cpp 2006-10-22 17:01:08 +02:00
@@ -342,7 +342,7 @@
{
NdbTransaction *trans= startTransactionLocal(0, nodeId);
- DBUG_PRINT("exit",("start trans: 0x%x transid: 0x%llx",
+ DBUG_PRINT("exit",("start trans: %p transid: 0x%llx",
trans, trans ? trans->getTransactionId() : 0));
DBUG_RETURN(trans);
}
@@ -364,7 +364,7 @@
{
DBUG_ENTER("Ndb::hupp");
- DBUG_PRINT("enter", ("trans: 0x%x",pBuddyTrans));
+ DBUG_PRINT("enter", ("trans: %p",pBuddyTrans));
Uint32 aPriority = 0;
if (pBuddyTrans == NULL){
@@ -389,7 +389,7 @@
}
pCon->setTransactionId(pBuddyTrans->getTransactionId());
pCon->setBuddyConPtr((Uint32)pBuddyTrans->getTC_ConnectPtr());
- DBUG_PRINT("exit", ("hupp trans: 0x%x transid: 0x%llx",
+ DBUG_PRINT("exit", ("hupp trans: %p transid: 0x%llx",
pCon, pCon ? pCon->getTransactionId() : 0));
DBUG_RETURN(pCon);
} else {
@@ -477,7 +477,7 @@
tCon = theTransactionList;
theRemainingStartTransactions++;
- DBUG_PRINT("info",("close trans: 0x%x transid: 0x%llx",
+ DBUG_PRINT("info",("close trans: %p transid: 0x%llx",
aConnection, aConnection->getTransactionId()));
DBUG_PRINT("info",("magic number: 0x%x TCConPtr: 0x%x theMyRef: 0x%x 0x%x",
aConnection->theMagicNumber, aConnection->theTCConPtr,
--- 1.60/storage/ndb/src/ndbapi/NdbTransaction.cpp 2006-10-22 17:01:08 +02:00
+++ 1.61/storage/ndb/src/ndbapi/NdbTransaction.cpp 2006-10-22 17:01:08 +02:00
@@ -504,7 +504,7 @@
AbortOption abortOption)
{
DBUG_ENTER("NdbTransaction::executeAsynchPrepare");
- DBUG_PRINT("enter", ("aTypeOfExec: %d, aCallback: %x, anyObject: %x",
+ DBUG_PRINT("enter", ("aTypeOfExec: %d, aCallback: %p, anyObject: %p",
aTypeOfExec, aCallback, anyObject));
/**
--- 1.70/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp 2006-10-22 17:01:08 +02:00
+++ 1.71/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp 2006-10-22 17:01:08 +02:00
@@ -203,7 +203,7 @@
m_has_error= 0;
- DBUG_PRINT("exit",("this: 0x%x oid: %u", this, m_oid));
+ DBUG_PRINT("exit",("this: %p oid: %u", this, m_oid));
DBUG_VOID_RETURN;
}
@@ -739,7 +739,7 @@
NdbTableImpl *tmp_table_impl= m_eventImpl->m_tableImpl;
m_eventImpl->m_tableImpl = at;
- DBUG_PRINT("info", ("switching table impl 0x%x -> 0x%x",
+ DBUG_PRINT("info", ("switching table impl %p -> %p",
tmp_table_impl, at));
// change the rec attrs to refer to the new table object
@@ -751,8 +751,8 @@
{
int no = p->getColumn()->getColumnNo();
NdbColumnImpl *tAttrInfo = at->getColumn(no);
- DBUG_PRINT("info", ("rec_attr: 0x%x "
- "switching column impl 0x%x -> 0x%x",
+ DBUG_PRINT("info", ("rec_attr: %p "
+ "switching column impl %p -> %p",
p, p->m_column, tAttrInfo));
p->m_column = tAttrInfo;
p = p->next();
@@ -765,8 +765,8 @@
{
int no = p->getColumn()->getColumnNo();
NdbColumnImpl *tAttrInfo = at->getColumn(no);
- DBUG_PRINT("info", ("rec_attr: 0x%x "
- "switching column impl 0x%x -> 0x%x",
+ DBUG_PRINT("info", ("rec_attr: %p "
+ "switching column impl %p -> %p",
p, p->m_column, tAttrInfo));
p->m_column = tAttrInfo;
p = p->next();
@@ -1269,7 +1269,7 @@
EventBufData_list::Gci_op g = gci_ops->m_gci_op_list[(*iter)++];
if (event_types != NULL)
*event_types = g.event_types;
- DBUG_PRINT("info", ("gci: %d g.op: %x g.event_types: %x",
+ DBUG_PRINT("info", ("gci: %d g.op: %p g.event_types: %x",
(unsigned)gci_ops->m_gci, g.op, g.event_types));
DBUG_RETURN(g.op);
}
--- 1.17/storage/ndb/src/ndbapi/NdbOperationInt.cpp 2006-10-22 17:01:08 +02:00
+++ 1.18/storage/ndb/src/ndbapi/NdbOperationInt.cpp 2006-10-22 17:01:08 +02:00
@@ -1021,7 +1021,7 @@
bool nopad, Uint32 Label){
DBUG_ENTER("NdbOperation::branch_col");
- DBUG_PRINT("enter", ("type=%u col=%u val=0x%x len=%u label=%u",
+ DBUG_PRINT("enter", ("type=%u col=%u val=%p len=%u label=%u",
type, ColId, val, len, Label));
if (val != NULL)
DBUG_DUMP("value", (char*)val, len);
--- 1.40/storage/ndb/src/ndbapi/Ndbinit.cpp 2006-10-22 17:01:08 +02:00
+++ 1.41/storage/ndb/src/ndbapi/Ndbinit.cpp 2006-10-22 17:01:08 +02:00
@@ -43,7 +43,7 @@
: theImpl(NULL)
{
DBUG_ENTER("Ndb::Ndb()");
- DBUG_PRINT("enter",("Ndb::Ndb this=0x%x", this));
+ DBUG_PRINT("enter",("Ndb::Ndb this=%p", this));
setup(ndb_cluster_connection, aDataBase, aSchema);
DBUG_VOID_RETURN;
}
@@ -132,7 +132,7 @@
Ndb::~Ndb()
{
DBUG_ENTER("Ndb::~Ndb()");
- DBUG_PRINT("enter",("this=0x%x",this));
+ DBUG_PRINT("enter",("this=%p",this));
if (m_sys_tab_0)
getDictionary()->removeTableGlobal(*m_sys_tab_0, 0);
--- 1.10/storage/ndb/src/ndbapi/ObjectMap.hpp 2006-10-22 17:01:08 +02:00
+++ 1.11/storage/ndb/src/ndbapi/ObjectMap.hpp 2006-10-22 17:01:08 +02:00
@@ -84,7 +84,7 @@
// unlock();
- DBUG_PRINT("info",("NdbObjectIdMap::map(0x%x) %u", object, ff<<2));
+ DBUG_PRINT("info",("NdbObjectIdMap::map(%p) %u", object, ff<<2));
return ff<<2;
}
@@ -102,14 +102,14 @@
m_map[i].m_next = m_firstFree;
m_firstFree = i;
} else {
- ndbout_c("Error: NdbObjectIdMap::::unmap(%u, 0x%x) obj=0x%x", id, object, obj);
- DBUG_PRINT("error",("NdbObjectIdMap::unmap(%u, 0x%x) obj=0x%x", id, object, obj));
+ ndbout_c("Error: NdbObjectIdMap::::unmap(%u, %p) obj=%p", id, object, obj);
+ DBUG_PRINT("error",("NdbObjectIdMap::unmap(%u, %p) obj=%p", id, object, obj));
return 0;
}
// unlock();
- DBUG_PRINT("info",("NdbObjectIdMap::unmap(%u) obj=0x%x", id, obj));
+ DBUG_PRINT("info",("NdbObjectIdMap::unmap(%u) obj=%p", id, obj));
return obj;
}
--- 1.359/sql/ha_ndbcluster.cc 2006-10-22 17:01:08 +02:00
+++ 1.360/sql/ha_ndbcluster.cc 2006-10-22 17:01:08 +02:00
@@ -414,7 +414,7 @@
thd_ndb_share->stat.no_uncommitted_rows_count= 0;
thd_ndb_share->stat.records= ~(ha_rows)0;
}
- DBUG_PRINT("exit", ("thd_ndb_share: 0x%x key: 0x%x", thd_ndb_share, key));
+ DBUG_PRINT("exit", ("thd_ndb_share: %p key: %p", thd_ndb_share, key));
DBUG_RETURN(thd_ndb_share);
}
@@ -1164,7 +1164,7 @@
index= dict->getIndexGlobal(index_name, *m_table);
if (!index)
ERR_RETURN(dict->getNdbError());
- DBUG_PRINT("info", ("index: 0x%x id: %d version: %d.%d status: %d",
+ DBUG_PRINT("info", ("index: %p id: %d version: %d.%d status: %d",
index,
index->getObjectId(),
index->getObjectVersion() & 0xFFFFFF,
@@ -1208,7 +1208,7 @@
index= dict->getIndexGlobal(unique_index_name, *m_table);
if (!index)
ERR_RETURN(dict->getNdbError());
- DBUG_PRINT("info", ("index: 0x%x id: %d version: %d.%d status: %d",
+ DBUG_PRINT("info", ("index: %p id: %d version: %d.%d status: %d",
index,
index->getObjectId(),
index->getObjectVersion() & 0xFFFFFF,
@@ -4678,7 +4678,7 @@
DBUG_RETURN(2);
}
- DBUG_PRINT("info", ("setFrm data=%lx len=%d", pack_data, pack_length));
+ DBUG_PRINT("info", ("setFrm data=%p len=%d", pack_data, pack_length));
tab.setFrm(pack_data, pack_length);
my_free((char*)data, MYF(0));
my_free((char*)pack_data, MYF(0));
@@ -7147,7 +7147,7 @@
{
NDB_SHARE *share= (NDB_SHARE*) hash_element(&ndbcluster_open_tables, i);
DBUG_PRINT("share",
- ("[%d] 0x%lx key: %s key_length: %d",
+ ("[%d] %p key: %s key_length: %d",
i, share, share->key, share->key_length));
DBUG_PRINT("share",
("db.tablename: %s.%s use_count: %d commit_count: %d",
@@ -7309,7 +7309,7 @@
ha_ndbcluster::set_tabname(new_key, share->table_name);
DBUG_PRINT("rename_share",
- ("0x%lx key: %s key_length: %d",
+ ("%p key: %s key_length: %d",
share, share->key, share->key_length));
DBUG_PRINT("rename_share",
("db.tablename: %s.%s use_count: %d commit_count: %d",
@@ -7350,7 +7350,7 @@
dbug_print_open_tables();
DBUG_PRINT("get_share",
- ("0x%lx key: %s key_length: %d",
+ ("%p key: %s key_length: %d",
share, share->key, share->key_length));
DBUG_PRINT("get_share",
("db.tablename: %s.%s use_count: %d commit_count: %d",
@@ -7448,7 +7448,7 @@
dbug_print_open_tables();
DBUG_PRINT("info",
- ("0x%lx key: %s key_length: %d key: %s",
+ ("%p key: %s key_length: %d key: %s",
share, share->key, share->key_length, key));
DBUG_PRINT("info",
("db.tablename: %s.%s use_count: %d commit_count: %d",
@@ -7464,7 +7464,7 @@
{
DBUG_ENTER("ndbcluster_real_free_share");
DBUG_PRINT("real_free_share",
- ("0x%lx key: %s key_length: %d",
+ ("%p key: %s key_length: %d",
(*share), (*share)->key, (*share)->key_length));
DBUG_PRINT("real_free_share",
("db.tablename: %s.%s use_count: %d commit_count: %d",
@@ -7518,7 +7518,7 @@
{
dbug_print_open_tables();
DBUG_PRINT("free_share",
- ("0x%lx key: %s key_length: %d",
+ ("%p key: %s key_length: %d",
*share, (*share)->key, (*share)->key_length));
DBUG_PRINT("free_share",
("db.tablename: %s.%s use_count: %d commit_count: %d",
--- 1.6/mysys/mf_keycaches.c 2006-10-22 17:01:08 +02:00
+++ 1.7/mysys/mf_keycaches.c 2006-10-22 17:01:08 +02:00
@@ -159,7 +159,7 @@
result= hash->default_value;
else
result= ((SAFE_HASH_ENTRY*) result)->data;
- DBUG_PRINT("exit",("data: 0x%lx", result));
+ DBUG_PRINT("exit",("data: %p", result));
DBUG_RETURN(result);
}
@@ -190,7 +190,7 @@
SAFE_HASH_ENTRY *entry;
my_bool error= 0;
DBUG_ENTER("safe_hash_set");
- DBUG_PRINT("enter",("key: %.*s data: 0x%lx", length, key, data));
+ DBUG_PRINT("enter",("key: %.*s data: %p", length, key, data));
rw_wrlock(&hash->mutex);
entry= (SAFE_HASH_ENTRY*) hash_search(&hash->hash, key, length);
--- 1.11/sql/strfunc.cc 2006-10-22 17:01:08 +02:00
+++ 1.12/sql/strfunc.cc 2006-10-22 17:01:08 +02:00
@@ -150,7 +150,7 @@
int pos;
const char *j;
DBUG_ENTER("find_type2");
- DBUG_PRINT("enter",("x: '%.*s' lib: 0x%lx", length, x, typelib));
+ DBUG_PRINT("enter",("x: '%.*s' lib: %p", length, x, typelib));
if (!typelib->count)
{
--- 1.72/libmysqld/libmysqld.c 2006-10-22 17:01:08 +02:00
+++ 1.73/libmysqld/libmysqld.c 2006-10-22 17:01:08 +02:00
@@ -206,7 +206,7 @@
}
}
- DBUG_PRINT("exit",("Mysql handler: %lx",mysql));
+ DBUG_PRINT("exit",("Mysql handler: %p",mysql));
DBUG_RETURN(mysql);
error:
--- 1.77/sql/ha_partition.cc 2006-10-22 17:01:08 +02:00
+++ 1.78/sql/ha_partition.cc 2006-10-22 17:01:08 +02:00
@@ -2939,7 +2939,7 @@
include_partition_fields_in_used_fields();
/* Now we see what the index of our first important partition is */
- DBUG_PRINT("info", ("m_part_info->used_partitions 0x%x",
+ DBUG_PRINT("info", ("m_part_info->used_partitions %p",
m_part_info->used_partitions.bitmap));
part_id= bitmap_get_first_set(&(m_part_info->used_partitions));
DBUG_PRINT("info", ("m_part_spec.start_part %d", part_id));
--- 1.94/sql/sql_partition.cc 2006-10-22 17:01:08 +02:00
+++ 1.95/sql/sql_partition.cc 2006-10-22 17:01:08 +02:00
@@ -4480,7 +4480,7 @@
{
if (!alt_part_info->use_default_partitions)
{
- DBUG_PRINT("info", ("part_info= %x", tab_part_info));
+ DBUG_PRINT("info", ("part_info= %p", tab_part_info));
tab_part_info->use_default_partitions= FALSE;
}
tab_part_info->use_default_no_partitions= FALSE;
--- 1.83/storage/federated/ha_federated.cc 2006-10-22 17:01:08 +02:00
+++ 1.84/storage/federated/ha_federated.cc 2006-10-22 17:01:08 +02:00
@@ -561,7 +561,7 @@
{
DBUG_PRINT("info",
("error: parse_url. Returning error code %d \
- freeing share->scheme %lx", error_num, share->scheme));
+ freeing share->scheme %p", error_num, share->scheme));
my_free((gptr) share->scheme, MYF(0));
share->scheme= 0;
}
@@ -627,7 +627,7 @@
MYF(0));
share->connect_string_length= table->s->connect_string.length;
- DBUG_PRINT("info",("parse_url alloced share->scheme %lx", share->scheme));
+ DBUG_PRINT("info",("parse_url alloced share->scheme %p", share->scheme));
/*
remove addition of null terminator and store length
--- 1.44/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp 2006-10-22 17:01:08 +02:00
+++ 1.45/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp 2006-10-22 17:01:08 +02:00
@@ -271,7 +271,7 @@
m_latest_trans_gci(0)
{
DBUG_ENTER("Ndb_cluster_connection");
- DBUG_PRINT("enter",("Ndb_cluster_connection this=0x%x", this));
+ DBUG_PRINT("enter",("Ndb_cluster_connection this=%p", this));
if (!m_event_add_drop_mutex)
m_event_add_drop_mutex= NdbMutex_Create();
--- 1.84/sql/ha_ndbcluster_binlog.cc 2006-10-22 17:01:08 +02:00
+++ 1.85/sql/ha_ndbcluster_binlog.cc 2006-10-22 17:01:08 +02:00
@@ -161,8 +161,8 @@
}
DBUG_PRINT("info",
("%s: %s.%s s->fields: %d "
- "reclength: %d rec_buff_length: %d record[0]: %lx "
- "record[1]: %lx",
+ "reclength: %d rec_buff_length: %d record[0]: %p "
+ "record[1]: %p",
info,
table->s->db.str,
table->s->table_name.str,
@@ -177,7 +177,7 @@
Field *f= table->field[i];
DBUG_PRINT("info",
("[%d] \"%s\"(0x%lx:%s%s%s%s%s%s) type: %d pack_length: %d "
- "ptr: 0x%lx[+%d] null_bit: %u null_ptr: 0x%lx[+%d]",
+ "ptr: %p[+%d] null_bit: %u null_ptr: %p[+%d]",
i,
f->field_name,
f->flags,
@@ -195,7 +195,7 @@
if (f->type() == MYSQL_TYPE_BIT)
{
Field_bit *g= (Field_bit*) f;
- DBUG_PRINT("MYSQL_TYPE_BIT",("field_length: %d bit_ptr: 0x%lx[+%d] "
+ DBUG_PRINT("MYSQL_TYPE_BIT",("field_length: %d bit_ptr: %p[+%d] "
"bit_ofs: %u bit_len: %u",
g->field_length, g->bit_ptr,
(byte*) g->bit_ptr-table->record[0],
@@ -604,7 +604,7 @@
else
{
DBUG_PRINT("share",
- ("[%d] 0x%lx key: %s key_length: %d",
+ ("[%d] %p key: %s key_length: %d",
i, share, share->key, share->key_length));
DBUG_PRINT("share",
("db.tablename: %s.%s use_count: %d commit_count: %d",
@@ -2721,9 +2721,9 @@
if (share->flags & NSF_BLOB_FLAG)
op->mergeEvents(TRUE); // currently not inherited from event
- DBUG_PRINT("info", ("share->ndb_value[0]: 0x%x",
+ DBUG_PRINT("info", ("share->ndb_value[0]: %p",
share->ndb_value[0]));
- DBUG_PRINT("info", ("share->ndb_value[1]: 0x%x",
+ DBUG_PRINT("info", ("share->ndb_value[1]: %p",
share->ndb_value[1]));
int n_columns= ndbtab->getNoOfColumns();
int n_fields= table ? table->s->fields : 0; // XXX ???
@@ -2778,11 +2778,11 @@
}
share->ndb_value[0][j].ptr= attr0.ptr;
share->ndb_value[1][j].ptr= attr1.ptr;
- DBUG_PRINT("info", ("&share->ndb_value[0][%d]: 0x%x "
- "share->ndb_value[0][%d]: 0x%x",
+ DBUG_PRINT("info", ("&share->ndb_value[0][%d]: %p "
+ "share->ndb_value[0][%d]: %p",
j, &share->ndb_value[0][j], j, attr0.ptr));
- DBUG_PRINT("info", ("&share->ndb_value[1][%d]: 0x%x "
- "share->ndb_value[1][%d]: 0x%x",
+ DBUG_PRINT("info", ("&share->ndb_value[1][%d]: %p "
+ "share->ndb_value[1][%d]: %p",
j, &share->ndb_value[0][j], j, attr1.ptr));
}
op->setCustomData((void *) share); // set before execute
@@ -2826,7 +2826,7 @@
(void) pthread_cond_signal(&injector_cond);
}
- DBUG_PRINT("info",("%s share->op: 0x%lx, share->use_count: %u",
+ DBUG_PRINT("info",("%s share->op: %p, share->use_count: %u",
share->key, share->op, share->use_count));
if (ndb_extra_logging)
@@ -3013,8 +3013,8 @@
apply_status_share= 0;
}
DBUG_PRINT("info", ("CLUSTER FAILURE EVENT: "
- "%s received share: 0x%lx op: %lx share op: %lx "
- "op_old: %lx",
+ "%s received share: %p op: %p share op: %p "
+ "op_old: %p",
share->key, share, pOp, share->op, share->op_old));
break;
case NDBEVENT::TE_DROP:
@@ -3033,8 +3033,8 @@
// fall through
case NDBEVENT::TE_ALTER:
row.n_schemaops++;
- DBUG_PRINT("info", ("TABLE %s EVENT: %s received share: 0x%lx op: %lx "
- "share op: %lx op_old: %lx",
+ DBUG_PRINT("info", ("TABLE %s EVENT: %s received share: %p op: %p "
+ "share op: %p op_old: %p",
type == NDBEVENT::TE_DROP ? "DROP" : "ALTER",
share->key, share, pOp, share->op, share->op_old));
break;
@@ -3786,7 +3786,7 @@
NDB_SHARE *share= (NDB_SHARE*) pOp->getCustomData();
DBUG_PRINT("info",
("EVENT TYPE: %d GCI: %lld last applied: %lld "
- "share: 0x%lx (%s.%s)", pOp->getEventType(), gci,
+ "share: %p (%s.%s)", pOp->getEventType(), gci,
ndb_latest_applied_binlog_epoch, share,
share ? share->db : "share == NULL",
share ? share->table_name : ""));
--- 1.39/vio/viossl.c 2006-10-22 17:01:08 +02:00
+++ 1.40/vio/viossl.c 2006-10-22 17:01:08 +02:00
@@ -82,7 +82,7 @@
{
int r;
DBUG_ENTER("vio_ssl_read");
- DBUG_PRINT("enter", ("sd: %d, buf: 0x%lx, size: %d, ssl_: 0x%lx",
+ DBUG_PRINT("enter", ("sd: %d, buf: %p, size: %d, ssl_: %p",
vio->sd, buf, size, vio->ssl_arg));
r= SSL_read((SSL*) vio->ssl_arg, buf, size);
@@ -99,7 +99,7 @@
{
int r;
DBUG_ENTER("vio_ssl_write");
- DBUG_PRINT("enter", ("sd: %d, buf: 0x%lx, size: %d", vio->sd, buf, size));
+ DBUG_PRINT("enter", ("sd: %d, buf: %p, size: %d", vio->sd, buf, size));
r= SSL_write((SSL*) vio->ssl_arg, buf, size);
#ifndef DBUG_OFF
| Thread |
|---|
| • bk commit into 5.1 tree (hartmut:1.2334) BUG#23529 | 'Hartmut Holzgraefe' | 22 Oct |
