summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--client/mysqltest.cc2
-rw-r--r--cmake/os/Windows.cmake4
-rw-r--r--dbug/dbug.c4
-rw-r--r--extra/innochecksum.cc6
-rw-r--r--extra/mariabackup/xbstream.c6
-rw-r--r--extra/mariabackup/xtrabackup.cc8
-rw-r--r--libmysqld/libmysql.c8
-rw-r--r--libmysqld/libmysqld.c2
-rw-r--r--mysys/hash.c12
-rw-r--r--mysys/list.c2
-rw-r--r--mysys/mf_iocache.c32
-rw-r--r--mysys/mf_keycache.c34
-rw-r--r--mysys/my_default.c4
-rw-r--r--mysys/my_fopen.c6
-rw-r--r--mysys/my_fstream.c20
-rw-r--r--mysys/my_getwd.c4
-rw-r--r--mysys/my_init.c2
-rw-r--r--mysys/my_lib.c6
-rw-r--r--mysys/my_safehash.c4
-rw-r--r--mysys/my_winthread.c9
-rw-r--r--mysys/thr_lock.c44
-rw-r--r--mysys/tree.c4
-rw-r--r--mysys/typelib.c4
-rw-r--r--mysys/wqueue.c14
-rw-r--r--mysys_ssl/my_sha.ic2
-rw-r--r--sql-common/client.c12
-rw-r--r--sql/create_options.cc4
-rw-r--r--sql/debug_sync.cc4
-rw-r--r--sql/event_data_objects.cc4
-rw-r--r--sql/event_db_repository.cc4
-rw-r--r--sql/event_parse_data.cc12
-rw-r--r--sql/event_queue.cc18
-rw-r--r--sql/event_scheduler.cc10
-rw-r--r--sql/events.cc2
-rw-r--r--sql/field.cc8
-rw-r--r--sql/gen_lex_token.cc2
-rw-r--r--sql/ha_partition.cc4
-rw-r--r--sql/handler.cc12
-rw-r--r--sql/item.cc4
-rw-r--r--sql/item.h2
-rw-r--r--sql/item_cmpfunc.cc4
-rw-r--r--sql/item_subselect.cc10
-rw-r--r--sql/log.cc8
-rw-r--r--sql/log_event.cc18
-rw-r--r--sql/log_event_old.cc20
-rw-r--r--sql/mysqld.cc8
-rw-r--r--sql/opt_range.cc10
-rw-r--r--sql/parse_file.cc4
-rw-r--r--sql/rpl_record.cc14
-rw-r--r--sql/rpl_tblmap.cc12
-rw-r--r--sql/slave.cc4
-rw-r--r--sql/sp.cc14
-rw-r--r--sql/sp_head.cc32
-rw-r--r--sql/sql_admin.cc2
-rw-r--r--sql/sql_base.cc26
-rw-r--r--sql/sql_binlog.cc4
-rw-r--r--sql/sql_cache.cc422
-rw-r--r--sql/sql_class.cc8
-rw-r--r--sql/sql_derived.cc2
-rw-r--r--sql/sql_insert.cc4
-rw-r--r--sql/sql_lex.cc22
-rw-r--r--sql/sql_manager.cc2
-rw-r--r--sql/sql_partition.cc2
-rw-r--r--sql/sql_plugin.cc14
-rw-r--r--sql/sql_prepare.cc8
-rw-r--r--sql/sql_select.cc18
-rw-r--r--sql/sql_servers.cc16
-rw-r--r--sql/sql_string.h6
-rw-r--r--sql/sql_table.cc10
-rw-r--r--sql/sql_view.cc2
-rw-r--r--sql/strfunc.cc2
-rw-r--r--sql/table.cc6
-rw-r--r--sql/table_cache.cc8
-rw-r--r--sql/temporary_tables.cc8
-rw-r--r--sql/threadpool_generic.cc4
-rw-r--r--sql/unireg.cc4
-rw-r--r--storage/connect/tabmysql.cpp4
-rw-r--r--storage/federated/ha_federated.cc18
-rw-r--r--storage/federatedx/ha_federatedx.cc18
-rw-r--r--storage/innobase/buf/buf0buf.cc2
-rw-r--r--storage/innobase/os/os0file.cc4
-rw-r--r--storage/maria/ha_maria.cc4
-rw-r--r--storage/maria/ma_bitmap.c4
-rw-r--r--storage/maria/ma_check.c8
-rw-r--r--storage/maria/ma_checkpoint.c11
-rw-r--r--storage/maria/ma_close.c4
-rw-r--r--storage/maria/ma_commit.c2
-rw-r--r--storage/maria/ma_control_file.c6
-rw-r--r--storage/maria/ma_delete.c16
-rw-r--r--storage/maria/ma_dynrec.c4
-rw-r--r--storage/maria/ma_keycache.c4
-rw-r--r--storage/maria/ma_loghandler.c446
-rw-r--r--storage/maria/ma_loghandler_lsn.h3
-rw-r--r--storage/maria/ma_open.c2
-rw-r--r--storage/maria/ma_page.c4
-rw-r--r--storage/maria/ma_pagecache.c20
-rw-r--r--storage/maria/ma_recovery.c62
-rw-r--r--storage/maria/ma_rkey.c4
-rw-r--r--storage/maria/ma_rt_split.c2
-rw-r--r--storage/maria/ma_search.c52
-rw-r--r--storage/maria/ma_servicethread.c6
-rw-r--r--storage/maria/ma_state.c8
-rw-r--r--storage/maria/ma_write.c14
-rw-r--r--storage/maria/maria_chk.c4
-rw-r--r--storage/maria/maria_read_log.c6
-rw-r--r--storage/maria/unittest/ma_test_loghandler-t.c30
-rw-r--r--storage/maria/unittest/ma_test_loghandler_first_lsn-t.c6
-rw-r--r--storage/maria/unittest/ma_test_loghandler_max_lsn-t.c6
-rw-r--r--storage/maria/unittest/ma_test_loghandler_multigroup-t.c24
-rw-r--r--storage/maria/unittest/ma_test_loghandler_multithread-t.c6
-rw-r--r--storage/maria/unittest/ma_test_loghandler_noflush-t.c2
-rw-r--r--storage/myisam/ha_myisam.cc4
-rw-r--r--storage/myisam/mi_check.c4
-rw-r--r--storage/myisam/mi_close.c4
-rw-r--r--storage/myisam/mi_delete.c14
-rw-r--r--storage/myisam/mi_dynrec.c4
-rw-r--r--storage/myisam/mi_rkey.c4
-rw-r--r--storage/myisam/mi_search.c50
-rw-r--r--storage/myisam/mi_write.c14
-rw-r--r--storage/myisammrg/ha_myisammrg.cc20
-rw-r--r--storage/rocksdb/ha_rocksdb.cc8
-rw-r--r--vio/vio.c6
-rw-r--r--vio/viosocket.c22
-rw-r--r--vio/viossl.c16
-rw-r--r--vio/viosslfactories.c4
125 files changed, 1053 insertions, 1040 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 6e844ce1799..30ca28577f3 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -7532,7 +7532,7 @@ void fix_win_paths(char *val, size_t len)
DBUG_PRINT("info", ("Converted \\ to /, p: %s", p));
}
}
- DBUG_PRINT("exit", (" val: %s, len: %d", val, len));
+ DBUG_PRINT("exit", (" val: %s, len: %zu", val, len));
DBUG_VOID_RETURN;
#endif
}
diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake
index 37fd204ed72..69cb9f3613d 100644
--- a/cmake/os/Windows.cmake
+++ b/cmake/os/Windows.cmake
@@ -139,8 +139,8 @@ IF(MSVC)
ENDIF()
#TODO: update the code and remove the disabled warnings
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4800 /wd4805 /wd4996 /we4700")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800 /wd4805 /wd4996 /wd4291 /wd4577 /we4099 /we4700")
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4800 /wd4805 /wd4996 /we4700 /we4311 /we4477 /we4302")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800 /wd4805 /wd4996 /wd4291 /wd4577 /we4099 /we4700 /we4311 /we4477 /we4302")
ENDIF()
diff --git a/dbug/dbug.c b/dbug/dbug.c
index 4b96560b907..08d81a51342 100644
--- a/dbug/dbug.c
+++ b/dbug/dbug.c
@@ -1341,8 +1341,8 @@ void _db_dump_(uint _line_, const char *keyword,
{
fprintf(cs->stack->out_file->file, "%s: ", cs->func);
}
- (void) fprintf(cs->stack->out_file->file, "%s: Memory: 0x%lx Bytes: (%ld)\n",
- keyword, (ulong) memory, (long) length);
+ (void) fprintf(cs->stack->out_file->file, "%s: Memory: %p Bytes: (%ld)\n",
+ keyword, memory, (long) length);
pos=0;
while (length-- > 0)
diff --git a/extra/innochecksum.cc b/extra/innochecksum.cc
index a0976970db7..6b4fc73d049 100644
--- a/extra/innochecksum.cc
+++ b/extra/innochecksum.cc
@@ -93,7 +93,7 @@ static bool use_end_page;
static bool do_one_page;
static my_bool do_leaf;
static my_bool per_page_details;
-static ulong n_merge;
+static ulint n_merge;
extern ulong srv_checksum_algorithm;
static ulong physical_page_size; /* Page size in bytes on disk. */
static ulong logical_page_size; /* Page size when uncompressed. */
@@ -1538,7 +1538,7 @@ int main(
byte* buf = NULL;
byte* xdes = NULL;
/* bytes read count */
- ulong bytes;
+ ulint bytes;
/* current time */
time_t now;
/* last time */
@@ -1675,7 +1675,7 @@ int main(
}
/* Read the minimum page size. */
- bytes = ulong(fread(buf, 1, UNIV_ZIP_SIZE_MIN, fil_in));
+ bytes = fread(buf, 1, UNIV_ZIP_SIZE_MIN, fil_in);
partial_page_read = true;
if (bytes != UNIV_ZIP_SIZE_MIN) {
diff --git a/extra/mariabackup/xbstream.c b/extra/mariabackup/xbstream.c
index f3880f9ec03..fa250132c04 100644
--- a/extra/mariabackup/xbstream.c
+++ b/extra/mariabackup/xbstream.c
@@ -531,8 +531,8 @@ mode_extract(int n_threads, int argc __attribute__((unused)),
ctxt.ds_ctxt = ds_ctxt;
ctxt.mutex = &mutex;
- tids = malloc(sizeof(pthread_t) * n_threads);
- retvals = malloc(sizeof(void*) * n_threads);
+ tids = calloc(n_threads, sizeof(pthread_t));
+ retvals = calloc(n_threads, sizeof(void*));
for (i = 0; i < n_threads; i++)
pthread_create(tids + i, NULL, extract_worker_thread_func,
@@ -542,7 +542,7 @@ mode_extract(int n_threads, int argc __attribute__((unused)),
pthread_join(tids[i], retvals + i);
for (i = 0; i < n_threads; i++) {
- if ((ulong)retvals[i] == XB_STREAM_READ_ERROR) {
+ if ((size_t)retvals[i] == XB_STREAM_READ_ERROR) {
ret = 1;
goto exit;
}
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index 6fc37ead4f6..f4c0af45cd7 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -1859,9 +1859,9 @@ xb_write_delta_metadata(const char *filename, const xb_delta_info_t *info)
MY_STAT mystat;
snprintf(buf, sizeof(buf),
- "page_size = %lu\n"
- "zip_size = %lu\n"
- "space_id = %lu\n",
+ "page_size = " ULINTPF "\n"
+ "zip_size = " ULINTPF " \n"
+ "space_id = " ULINTPF "\n",
info->page_size.logical(),
info->page_size.is_compressed()
? info->page_size.physical() : 0,
@@ -4174,7 +4174,7 @@ exit:
char tmpname[FN_REFLEN];
- snprintf(tmpname, FN_REFLEN, "%s/xtrabackup_tmp_#%lu",
+ snprintf(tmpname, FN_REFLEN, "%s/xtrabackup_tmp_#" ULINTPF,
dbname, fil_space->id);
msg("xtrabackup: Renaming %s to %s.ibd\n",
diff --git a/libmysqld/libmysql.c b/libmysqld/libmysql.c
index d06b32b0625..e610d239fa4 100644
--- a/libmysqld/libmysql.c
+++ b/libmysqld/libmysql.c
@@ -2053,9 +2053,9 @@ static my_bool store_param(MYSQL_STMT *stmt, MYSQL_BIND *param)
{
NET *net= &stmt->mysql->net;
DBUG_ENTER("store_param");
- DBUG_PRINT("enter",("type: %d buffer: 0x%lx length: %lu is_null: %d",
+ DBUG_PRINT("enter",("type: %d buffer:%p length: %lu is_null: %d",
param->buffer_type,
- (long) (param->buffer ? param->buffer : NullS),
+ param->buffer,
*param->length, *param->is_null));
if (*param->is_null)
@@ -2979,8 +2979,8 @@ mysql_stmt_send_long_data(MYSQL_STMT *stmt, uint param_number,
MYSQL_BIND *param;
DBUG_ENTER("mysql_stmt_send_long_data");
DBUG_ASSERT(stmt != 0);
- DBUG_PRINT("enter",("param no: %d data: 0x%lx, length : %ld",
- param_number, (long) data, length));
+ DBUG_PRINT("enter",("param no: %d data: %p, length : %ld",
+ param_number, data, length));
/*
We only need to check for stmt->param_count, if it's not null
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c
index 36728cf573c..d1771a09578 100644
--- a/libmysqld/libmysqld.c
+++ b/libmysqld/libmysqld.c
@@ -205,7 +205,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
}
}
- DBUG_PRINT("exit",("Mysql handler: 0x%lx", (long) mysql));
+ DBUG_PRINT("exit",("Mysql handler: %p", mysql));
DBUG_RETURN(mysql);
error:
diff --git a/mysys/hash.c b/mysys/hash.c
index ad01afba29e..57242735d99 100644
--- a/mysys/hash.c
+++ b/mysys/hash.c
@@ -84,7 +84,7 @@ my_hash_init2(HASH *hash, uint growth_size, CHARSET_INFO *charset,
{
my_bool res;
DBUG_ENTER("my_hash_init");
- DBUG_PRINT("enter",("hash: 0x%lx size: %u", (long) hash, (uint) size));
+ DBUG_PRINT("enter",("hash:%p size: %u", hash, (uint) size));
hash->records=0;
hash->key_offset=key_offset;
@@ -144,8 +144,8 @@ static inline void my_hash_free_elements(HASH *hash)
void my_hash_free(HASH *hash)
{
DBUG_ENTER("my_hash_free");
- DBUG_PRINT("enter",("hash: 0x%lx elements: %ld",
- (long) hash, hash->records));
+ DBUG_PRINT("enter",("hash:%p elements: %ld",
+ hash, hash->records));
my_hash_free_elements(hash);
hash->free= 0;
@@ -166,7 +166,7 @@ void my_hash_free(HASH *hash)
void my_hash_reset(HASH *hash)
{
DBUG_ENTER("my_hash_reset");
- DBUG_PRINT("enter",("hash: 0x%lxd", (long) hash));
+ DBUG_PRINT("enter",("hash:%p", hash));
my_hash_free_elements(hash);
reset_dynamic(&hash->array);
@@ -844,8 +844,8 @@ my_bool my_hash_check(HASH *hash)
blength, records)) != i)
{
DBUG_PRINT("error", ("Record in wrong link at %d: Start %d "
- "Record: 0x%lx Record-link %d",
- idx, i, (long) hash_info->data, rec_link));
+ "Record:%p Record-link %d",
+ idx, i, hash_info->data, rec_link));
error=1;
}
else
diff --git a/mysys/list.c b/mysys/list.c
index fb46120db04..2276ca72b48 100644
--- a/mysys/list.c
+++ b/mysys/list.c
@@ -27,7 +27,7 @@
LIST *list_add(LIST *root, LIST *element)
{
DBUG_ENTER("list_add");
- DBUG_PRINT("enter",("root: 0x%lx element: 0x%lx", (long) root, (long) element));
+ DBUG_PRINT("enter",("root: %p element: %p", root, element));
if (root)
{
if (root->prev) /* If add in mid of list */
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c
index 0c2c1da354c..a52ea2c5c40 100644
--- a/mysys/mf_iocache.c
+++ b/mysys/mf_iocache.c
@@ -154,8 +154,8 @@ int init_io_cache(IO_CACHE *info, File file, size_t cachesize,
my_off_t pos;
my_off_t end_of_file= ~(my_off_t) 0;
DBUG_ENTER("init_io_cache");
- DBUG_PRINT("enter",("cache: 0x%lx type: %d pos: %ld",
- (ulong) info, (int) type, (ulong) seek_offset));
+ DBUG_PRINT("enter",("cache:%p type: %d pos: %llu",
+ info, (int) type, (ulonglong) seek_offset));
info->file= file;
info->type= TYPE_NOT_SET; /* Don't set it until mutex are created */
@@ -437,8 +437,8 @@ my_bool reinit_io_cache(IO_CACHE *info, enum cache_type type,
my_bool clear_cache)
{
DBUG_ENTER("reinit_io_cache");
- DBUG_PRINT("enter",("cache: 0x%lx type: %d seek_offset: %lu clear_cache: %d",
- (ulong) info, type, (ulong) seek_offset,
+ DBUG_PRINT("enter",("cache:%p type: %d seek_offset: %llu clear_cache: %d",
+ info, type, (ulonglong) seek_offset,
(int) clear_cache));
DBUG_ASSERT(type == READ_CACHE || type == WRITE_CACHE);
@@ -865,10 +865,10 @@ void init_io_cache_share(IO_CACHE *read_cache, IO_CACHE_SHARE *cshare,
IO_CACHE *write_cache, uint num_threads)
{
DBUG_ENTER("init_io_cache_share");
- DBUG_PRINT("io_cache_share", ("read_cache: 0x%lx share: 0x%lx "
- "write_cache: 0x%lx threads: %u",
- (long) read_cache, (long) cshare,
- (long) write_cache, num_threads));
+ DBUG_PRINT("io_cache_share", ("read_cache: %p share: %p "
+ "write_cache: %p threads: %u",
+ read_cache, cshare,
+ write_cache, num_threads));
DBUG_ASSERT(num_threads > 1);
DBUG_ASSERT(read_cache->type == READ_CACHE);
@@ -930,9 +930,9 @@ void remove_io_thread(IO_CACHE *cache)
flush_io_cache(cache);
mysql_mutex_lock(&cshare->mutex);
- DBUG_PRINT("io_cache_share", ("%s: 0x%lx",
+ DBUG_PRINT("io_cache_share", ("%s: %p",
(cache == cshare->source_cache) ?
- "writer" : "reader", (long) cache));
+ "writer" : "reader", cache));
/* Remove from share. */
total= --cshare->total_threads;
@@ -1006,9 +1006,9 @@ static int lock_io_cache(IO_CACHE *cache, my_off_t pos)
/* Enter the lock. */
mysql_mutex_lock(&cshare->mutex);
cshare->running_threads--;
- DBUG_PRINT("io_cache_share", ("%s: 0x%lx pos: %lu running: %u",
+ DBUG_PRINT("io_cache_share", ("%s: %p pos: %lu running: %u",
(cache == cshare->source_cache) ?
- "writer" : "reader", (long) cache, (ulong) pos,
+ "writer" : "reader", cache, (ulong) pos,
cshare->running_threads));
if (cshare->source_cache)
@@ -1145,10 +1145,10 @@ static void unlock_io_cache(IO_CACHE *cache)
{
IO_CACHE_SHARE *cshare= cache->share;
DBUG_ENTER("unlock_io_cache");
- DBUG_PRINT("io_cache_share", ("%s: 0x%lx pos: %lu running: %u",
+ DBUG_PRINT("io_cache_share", ("%s: %p pos: %lu running: %u",
(cache == cshare->source_cache) ?
"writer" : "reader",
- (long) cache, (ulong) cshare->pos_in_file,
+ cache, (ulong) cshare->pos_in_file,
cshare->total_threads));
cshare->running_threads= cshare->total_threads;
@@ -1899,7 +1899,7 @@ int my_b_flush_io_cache(IO_CACHE *info, int need_append_buffer_lock)
size_t length;
my_bool append_cache= (info->type == SEQ_READ_APPEND);
DBUG_ENTER("my_b_flush_io_cache");
- DBUG_PRINT("enter", ("cache: 0x%lx", (long) info));
+ DBUG_PRINT("enter", ("cache: %p", info));
if (!append_cache)
need_append_buffer_lock= 0;
@@ -1977,7 +1977,7 @@ int end_io_cache(IO_CACHE *info)
{
int error=0;
DBUG_ENTER("end_io_cache");
- DBUG_PRINT("enter",("cache: 0x%lx", (ulong) info));
+ DBUG_PRINT("enter",("cache: %p", info));
/*
Every thread must call remove_io_thread(). The last one destroys
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c
index 34aeb569faf..683e3edecd0 100644
--- a/mysys/mf_keycache.c
+++ b/mysys/mf_keycache.c
@@ -609,11 +609,11 @@ int init_simple_key_cache(SIMPLE_KEY_CACHE_CB *keycache,
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",
- keycache->disk_blocks, (long) keycache->block_root,
- keycache->hash_entries, (long) keycache->hash_root,
- keycache->hash_links, (long) keycache->hash_link_root));
+ ("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));
}
else
{
@@ -963,7 +963,7 @@ static
void end_simple_key_cache(SIMPLE_KEY_CACHE_CB *keycache, my_bool cleanup)
{
DBUG_ENTER("end_simple_key_cache");
- DBUG_PRINT("enter", ("key_cache: 0x%lx", (long) keycache));
+ DBUG_PRINT("enter", ("key_cache: %p", keycache));
if (!keycache->key_cache_inited)
DBUG_VOID_RETURN;
@@ -4366,7 +4366,7 @@ int flush_simple_key_cache_blocks(SIMPLE_KEY_CACHE_CB *keycache,
{
int res= 0;
DBUG_ENTER("flush_key_blocks");
- DBUG_PRINT("enter", ("keycache: 0x%lx", (long) keycache));
+ DBUG_PRINT("enter", ("keycache: %p", keycache));
if (!keycache->key_cache_inited)
DBUG_RETURN(0);
@@ -4795,11 +4795,11 @@ void keycache_debug_log_close(void)
static int fail_block(BLOCK_LINK *block)
{
- F_B_PRT("block->next_used: %lx\n", (ulong) block->next_used);
- F_B_PRT("block->prev_used: %lx\n", (ulong) block->prev_used);
- F_B_PRT("block->next_changed: %lx\n", (ulong) block->next_changed);
- F_B_PRT("block->prev_changed: %lx\n", (ulong) block->prev_changed);
- F_B_PRT("block->hash_link: %lx\n", (ulong) block->hash_link);
+ F_B_PRT("block->next_used: %p\n", block->next_used);
+ F_B_PRT("block->prev_used: %p\n", block->prev_used);
+ F_B_PRT("block->next_changed: %p\n", block->next_changed);
+ F_B_PRT("block->prev_changed: %p\n", block->prev_changed);
+ F_B_PRT("block->hash_link: %p\n", block->hash_link);
F_B_PRT("block->status: %u\n", block->status);
F_B_PRT("block->length: %u\n", block->length);
F_B_PRT("block->offset: %u\n", block->offset);
@@ -4810,9 +4810,9 @@ static int fail_block(BLOCK_LINK *block)
static int fail_hlink(HASH_LINK *hlink)
{
- F_B_PRT("hlink->next: %lx\n", (ulong) hlink->next);
- F_B_PRT("hlink->prev: %lx\n", (ulong) hlink->prev);
- F_B_PRT("hlink->block: %lx\n", (ulong) hlink->block);
+ F_B_PRT("hlink->next: %p\n", hlink->next);
+ F_B_PRT("hlink->prev: %p\n", hlink->prev);
+ F_B_PRT("hlink->block: %p\n", hlink->block);
F_B_PRT("hlink->diskpos: %lu\n", (ulong) hlink->diskpos);
F_B_PRT("hlink->file: %d\n", hlink->file);
return 0; /* Let the assert fail. */
@@ -5358,7 +5358,7 @@ void end_partitioned_key_cache(PARTITIONED_KEY_CACHE_CB *keycache,
uint i;
uint partitions= keycache->partitions;
DBUG_ENTER("partitioned_end_key_cache");
- DBUG_PRINT("enter", ("key_cache: 0x%lx", (long) keycache));
+ DBUG_PRINT("enter", ("key_cache: %p", keycache));
for (i= 0; i < partitions; i++)
{
@@ -5672,7 +5672,7 @@ int flush_partitioned_key_cache_blocks(PARTITIONED_KEY_CACHE_CB *keycache,
int err= 0;
ulonglong *dirty_part_map= (ulonglong *) file_extra;
DBUG_ENTER("partitioned_flush_key_blocks");
- DBUG_PRINT("enter", ("keycache: 0x%lx", (long) keycache));
+ DBUG_PRINT("enter", ("keycache: %p", keycache));
for (i= 0; i < partitions; i++)
{
diff --git a/mysys/my_default.c b/mysys/my_default.c
index e7d661b33e5..37f6d2bfbbf 100644
--- a/mysys/my_default.c
+++ b/mysys/my_default.c
@@ -173,8 +173,8 @@ fn_expand(const char *filename, char *result_buf)
char dir[FN_REFLEN];
const int flags= MY_UNPACK_FILENAME | MY_SAFE_PATH | MY_RELATIVE_PATH;
DBUG_ENTER("fn_expand");
- DBUG_PRINT("enter", ("filename: %s, result_buf: 0x%lx",
- filename, (unsigned long) result_buf));
+ DBUG_PRINT("enter", ("filename: %s, result_buf: %p",
+ filename, result_buf));
if (my_getwd(dir, sizeof(dir), MYF(0)))
DBUG_RETURN(3);
DBUG_PRINT("debug", ("dir: %s", dir));
diff --git a/mysys/my_fopen.c b/mysys/my_fopen.c
index c720e2c9168..7dde1e1b4fc 100644
--- a/mysys/my_fopen.c
+++ b/mysys/my_fopen.c
@@ -74,7 +74,7 @@ FILE *my_fopen(const char *filename, int flags, myf MyFlags)
my_file_total_opened++;
my_file_info[filedesc].type= STREAM_BY_FOPEN;
mysql_mutex_unlock(&THR_LOCK_open);
- DBUG_PRINT("exit",("stream: 0x%lx", (long) fd));
+ DBUG_PRINT("exit",("stream: %p", fd));
DBUG_RETURN(fd);
}
else
@@ -222,7 +222,7 @@ int my_fclose(FILE *fd, myf MyFlags)
{
int err,file;
DBUG_ENTER("my_fclose");
- DBUG_PRINT("my",("stream: 0x%lx MyFlags: %lu", (long) fd, MyFlags));
+ DBUG_PRINT("my",("stream: %p MyFlags: %lu", fd, MyFlags));
mysql_mutex_lock(&THR_LOCK_open);
file= my_fileno(fd);
@@ -292,7 +292,7 @@ FILE *my_fdopen(File Filedes, const char *name, int Flags, myf MyFlags)
mysql_mutex_unlock(&THR_LOCK_open);
}
- DBUG_PRINT("exit",("stream: 0x%lx", (long) fd));
+ DBUG_PRINT("exit",("stream: %p", fd));
DBUG_RETURN(fd);
} /* my_fdopen */
diff --git a/mysys/my_fstream.c b/mysys/my_fstream.c
index de752fa149f..bfcf24bfa2e 100644
--- a/mysys/my_fstream.c
+++ b/mysys/my_fstream.c
@@ -46,8 +46,8 @@ size_t my_fread(FILE *stream, uchar *Buffer, size_t Count, myf MyFlags)
{
size_t readbytes;
DBUG_ENTER("my_fread");
- DBUG_PRINT("my",("stream: 0x%lx Buffer: 0x%lx Count: %u MyFlags: %lu",
- (long) stream, (long) Buffer, (uint) Count, MyFlags));
+ DBUG_PRINT("my",("stream: %p Buffer %p Count: %u MyFlags: %lu",
+ stream, Buffer, (uint) Count, MyFlags));
if ((readbytes= fread(Buffer, sizeof(char), Count, stream)) != Count)
{
@@ -94,8 +94,8 @@ size_t my_fwrite(FILE *stream, const uchar *Buffer, size_t Count, myf MyFlags)
uint errors;
#endif
DBUG_ENTER("my_fwrite");
- DBUG_PRINT("my",("stream: 0x%lx Buffer: 0x%lx Count: %u MyFlags: %lu",
- (long) stream, (long) Buffer, (uint) Count, MyFlags));
+ DBUG_PRINT("my",("stream:%p Buffer:%p Count: %u MyFlags: %lu",
+ stream, Buffer, (uint) Count, MyFlags));
#if !defined(NO_BACKGROUND) && defined(USE_MY_STREAM)
errors=0;
@@ -163,8 +163,8 @@ my_off_t my_fseek(FILE *stream, my_off_t pos, int whence,
myf MyFlags __attribute__((unused)))
{
DBUG_ENTER("my_fseek");
- DBUG_PRINT("my",("stream: 0x%lx pos: %lu whence: %d MyFlags: %lu",
- (long) stream, (long) pos, whence, MyFlags));
+ DBUG_PRINT("my",("stream:%p pos: %llu whence: %d MyFlags: %lu",
+ stream, (ulonglong) pos, whence, MyFlags));
DBUG_RETURN(fseek(stream, (off_t) pos, whence) ?
MY_FILEPOS_ERROR : (my_off_t) ftell(stream));
} /* my_seek */
@@ -174,11 +174,11 @@ my_off_t my_fseek(FILE *stream, my_off_t pos, int whence,
my_off_t my_ftell(FILE *stream, myf MyFlags __attribute__((unused)))
{
- off_t pos;
+ long long pos;
DBUG_ENTER("my_ftell");
- DBUG_PRINT("my",("stream: 0x%lx MyFlags: %lu", (long) stream, MyFlags));
- pos=ftell(stream);
- DBUG_PRINT("exit",("ftell: %lu",(ulong) pos));
+ DBUG_PRINT("my",("stream:%p MyFlags: %lu", stream, MyFlags));
+ pos=IF_WIN(_ftelli64(stream),ftell(stream));
+ DBUG_PRINT("exit",("ftell: %lld",pos));
DBUG_RETURN((my_off_t) pos);
} /* my_ftell */
diff --git a/mysys/my_getwd.c b/mysys/my_getwd.c
index bfa28f1d372..46710e79f62 100644
--- a/mysys/my_getwd.c
+++ b/mysys/my_getwd.c
@@ -48,8 +48,8 @@ int my_getwd(char * buf, size_t size, myf MyFlags)
{
char * pos;
DBUG_ENTER("my_getwd");
- DBUG_PRINT("my",("buf: 0x%lx size: %u MyFlags %lu",
- (long) buf, (uint) size, MyFlags));
+ DBUG_PRINT("my",("buf:%p size: %u MyFlags %lu",
+ buf, (uint) size, MyFlags));
if (size < 1)
DBUG_RETURN(-1);
diff --git a/mysys/my_init.c b/mysys/my_init.c
index 84489a994e3..86775275f23 100644
--- a/mysys/my_init.c
+++ b/mysys/my_init.c
@@ -253,8 +253,6 @@ void my_parameter_handler(const wchar_t * expression, const wchar_t * function,
const wchar_t * file, unsigned int line,
uintptr_t pReserved)
{
- DBUG_PRINT("my",("Expression: %s function: %s file: %s, line: %d",
- expression, function, file, line));
__debugbreak();
}
diff --git a/mysys/my_lib.c b/mysys/my_lib.c
index abc7b8a3161..d5f54f00b85 100644
--- a/mysys/my_lib.c
+++ b/mysys/my_lib.c
@@ -221,7 +221,7 @@ MY_DIR *my_dir(const char *path, myf MyFlags)
long handle;
#endif
DBUG_ENTER("my_dir");
- DBUG_PRINT("my",("path: '%s' stat: %d MyFlags: %d",path,MyFlags));
+ DBUG_PRINT("my",("path: '%s' MyFlags: %d",path,MyFlags));
/* Put LIB-CHAR as last path-character if not there */
tmp_file=tmp_path;
@@ -347,8 +347,8 @@ MY_STAT *my_stat(const char *path, MY_STAT *stat_area, myf my_flags)
{
int m_used;
DBUG_ENTER("my_stat");
- DBUG_PRINT("my", ("path: '%s' stat_area: 0x%lx MyFlags: %lu", path,
- (long) stat_area, my_flags));
+ DBUG_PRINT("my", ("path: '%s' stat_area: %p MyFlags: %lu", path,
+ stat_area, my_flags));
if ((m_used= (stat_area == NULL)))
if (!(stat_area= (MY_STAT *) my_malloc(sizeof(MY_STAT), my_flags)))
diff --git a/mysys/my_safehash.c b/mysys/my_safehash.c
index c34f3c456cd..e50c5105875 100644
--- a/mysys/my_safehash.c
+++ b/mysys/my_safehash.c
@@ -166,7 +166,7 @@ uchar *safe_hash_search(SAFE_HASH *hash, const uchar *key, uint length,
result= def;
else
result= ((SAFE_HASH_ENTRY*) result)->data;
- DBUG_PRINT("exit",("data: 0x%lx", (long) result));
+ DBUG_PRINT("exit",("data: %p", result));
DBUG_RETURN(result);
}
@@ -197,7 +197,7 @@ my_bool safe_hash_set(SAFE_HASH *hash, const uchar *key, uint length,
SAFE_HASH_ENTRY *entry;
my_bool error= 0;
DBUG_ENTER("safe_hash_set");
- DBUG_PRINT("enter",("key: %.*s data: 0x%lx", length, key, (long) data));
+ DBUG_PRINT("enter",("key: %.*s data: %p", length, key, data));
mysql_rwlock_wrlock(&hash->mutex);
entry= (SAFE_HASH_ENTRY*) my_hash_search(&hash->hash, key, length);
diff --git a/mysys/my_winthread.c b/mysys/my_winthread.c
index 31385fad360..f3335621c38 100644
--- a/mysys/my_winthread.c
+++ b/mysys/my_winthread.c
@@ -121,6 +121,15 @@ int pthread_join(pthread_t thread, void **value_ptr)
goto error_return;
}
+ if (!GetExitCodeThread(handle, &ret))
+ {
+ errno= EINVAL;
+ goto error_return;
+ }
+
+ if (value_ptr)
+ *value_ptr= (void *)(size_t)ret;
+
CloseHandle(handle);
return 0;
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c
index 25113670015..5cf81bcc93e 100644
--- a/mysys/thr_lock.c
+++ b/mysys/thr_lock.c
@@ -760,9 +760,9 @@ thr_lock(THR_LOCK_DATA *data, THR_LOCK_INFO *owner, ulong lock_wait_timeout)
PSI_TABLE_LOCK, lock_type);
mysql_mutex_lock(&lock->mutex);
- DBUG_PRINT("lock",("data: 0x%lx thread: 0x%lx lock: 0x%lx type: %d",
- (long) data, (ulong) data->owner->thread_id,
- (long) lock, (int) lock_type));
+ DBUG_PRINT("lock",("data:%p thread:%lu lock:%p type: %d",
+ data, (ulong) data->owner->thread_id,
+ lock, (int) lock_type));
check_locks(lock,(uint) lock_type <= (uint) TL_READ_NO_INSERT ?
"enter read_lock" : "enter write_lock", lock_type, 0);
if ((int) lock_type <= (int) TL_READ_NO_INSERT)
@@ -797,7 +797,7 @@ thr_lock(THR_LOCK_DATA *data, THR_LOCK_INFO *owner, ulong lock_wait_timeout)
See Bug#42147 for more information.
*/
- DBUG_PRINT("lock",("write locked 1 by thread: 0x%lx",
+ DBUG_PRINT("lock",("write locked 1 by thread:%lu",
(ulong) lock->write.data->owner->thread_id));
if (thr_lock_owner_equal(data->owner, lock->write.data->owner) ||
(lock->write.data->type <= TL_WRITE_DELAYED &&
@@ -942,8 +942,8 @@ thr_lock(THR_LOCK_DATA *data, THR_LOCK_INFO *owner, ulong lock_wait_timeout)
! lock->read_no_write_count) ||
has_old_lock(lock->write.data, data->owner))
{
- DBUG_PRINT("info", ("write_wait.data: 0x%lx old_type: %d",
- (ulong) lock->write_wait.data,
+ DBUG_PRINT("info", ("write_wait.data: %p old_type: %d",
+ lock->write_wait.data,
lock->write.data->type));
(*lock->write.last)=data; /* Add to running fifo */
@@ -956,13 +956,13 @@ thr_lock(THR_LOCK_DATA *data, THR_LOCK_INFO *owner, ulong lock_wait_timeout)
statistic_increment(locks_immediate,&THR_LOCK_lock);
goto end;
}
- DBUG_PRINT("lock",("write locked 2 by thread: 0x%lx",
+ DBUG_PRINT("lock",("write locked 2 by thread: %lu",
(ulong) lock->write.data->owner->thread_id));
}
else
{
- DBUG_PRINT("info", ("write_wait.data: 0x%lx",
- (ulong) lock->write_wait.data));
+ DBUG_PRINT("info", ("write_wait.data:%p",
+ lock->write_wait.data));
if (!lock->write_wait.data)
{ /* no scheduled write locks */
my_bool concurrent_insert= 0;
@@ -992,7 +992,7 @@ thr_lock(THR_LOCK_DATA *data, THR_LOCK_INFO *owner, ulong lock_wait_timeout)
goto end;
}
}
- DBUG_PRINT("lock",("write locked 3 by thread: 0x%lx type: %d",
+ DBUG_PRINT("lock",("write locked 3 by thread:%lu type: %d",
(ulong) lock->read.data->owner->thread_id,
data->type));
}
@@ -1058,8 +1058,8 @@ static inline void free_all_read_locks(THR_LOCK *lock,
lock->read_no_write_count++;
}
/* purecov: begin inspected */
- DBUG_PRINT("lock",("giving read lock to thread: 0x%lx",
- (ulong) data->owner->thread_id));
+ DBUG_PRINT("lock",("giving read lock to thread: %lu",
+ (ulong)data->owner->thread_id));
/* purecov: end */
data->cond=0; /* Mark thread free */
mysql_cond_signal(cond);
@@ -1077,7 +1077,7 @@ void thr_unlock(THR_LOCK_DATA *data, uint unlock_flags)
THR_LOCK *lock=data->lock;
enum thr_lock_type lock_type=data->type;
DBUG_ENTER("thr_unlock");
- DBUG_PRINT("lock",("data: %p thread: 0x%lx lock: %p",
+ DBUG_PRINT("lock",("data: %p thread: %lu lock: %p",
data, (ulong) data->owner->thread_id,
lock));
mysql_mutex_lock(&lock->mutex);
@@ -1171,7 +1171,7 @@ static void wake_up_waiters(THR_LOCK *lock)
(*lock->check_status)(data->status_param))
data->type=TL_WRITE; /* Upgrade lock */
/* purecov: begin inspected */
- DBUG_PRINT("lock",("giving write lock of type %d to thread: 0x%lx",
+ DBUG_PRINT("lock",("giving write lock of type %d to thread: %lu",
data->type, (ulong) data->owner->thread_id));
/* purecov: end */
{
@@ -1280,7 +1280,7 @@ thr_multi_lock(THR_LOCK_DATA **data, uint count, THR_LOCK_INFO *owner,
{
THR_LOCK_DATA **pos, **end, **first_lock;
DBUG_ENTER("thr_multi_lock");
- DBUG_PRINT("lock",("data: 0x%lx count: %d", (long) data, count));
+ DBUG_PRINT("lock",("data: %p count: %d", data, count));
if (count > 1)
sort_locks(data,count);
@@ -1301,8 +1301,8 @@ thr_multi_lock(THR_LOCK_DATA **data, uint count, THR_LOCK_INFO *owner,
DBUG_RETURN(result);
}
#ifdef MAIN
- printf("Thread: %s Got lock: 0x%lx type: %d\n",my_thread_name(),
- (long) pos[0]->lock, pos[0]->type); fflush(stdout);
+ printf("Thread: %s Got lock:%p type: %d\n",my_thread_name(),
+ pos[0]->lock, pos[0]->type); fflush(stdout);
#endif
}
DEBUG_SYNC_C("thr_multi_lock_after_thr_lock");
@@ -1401,21 +1401,21 @@ void thr_multi_unlock(THR_LOCK_DATA **data,uint count, uint unlock_flags)
{
THR_LOCK_DATA **pos,**end;
DBUG_ENTER("thr_multi_unlock");
- DBUG_PRINT("lock",("data: 0x%lx count: %d flags: %u", (long) data, count,
+ DBUG_PRINT("lock",("data: %p count: %d flags: %u", data, count,
unlock_flags));
for (pos=data,end=data+count; pos < end ; pos++)
{
#ifdef MAIN
- printf("Thread: %s Rel lock: 0x%lx type: %d\n",
- my_thread_name(), (long) pos[0]->lock, pos[0]->type);
+ printf("Thread: %s Rel lock: %p type: %d\n",
+ my_thread_name(), pos[0]->lock, pos[0]->type);
fflush(stdout);
#endif
if ((*pos)->type != TL_UNLOCK)
thr_unlock(*pos, unlock_flags);
else
{
- DBUG_PRINT("lock",("Free lock: data: %p thread: 0x%lx lock: %p",
+ DBUG_PRINT("lock",("Free lock: data: %p thread:%lu lock: %p",
*pos, (ulong) (*pos)->owner->thread_id,
(*pos)->lock));
}
@@ -1689,7 +1689,7 @@ void thr_print_locks(void)
{
THR_LOCK *lock=(THR_LOCK*) list->data;
mysql_mutex_lock(&lock->mutex);
- printf("lock: 0x%lx:",(ulong) lock);
+ printf("lock:%p:", lock);
if ((lock->write_wait.data || lock->read_wait.data) &&
(! lock->read.data && ! lock->write.data))
printf(" WARNING: ");
diff --git a/mysys/tree.c b/mysys/tree.c
index 5eaeb30037d..c71925df7db 100644
--- a/mysys/tree.c
+++ b/mysys/tree.c
@@ -90,7 +90,7 @@ void init_tree(TREE *tree, size_t default_alloc_size, size_t memory_limit,
myf my_flags)
{
DBUG_ENTER("init_tree");
- DBUG_PRINT("enter",("tree: 0x%lx size: %d", (long) tree, size));
+ DBUG_PRINT("enter",("tree: %p size: %d", tree, size));
if (default_alloc_size < DEFAULT_ALLOC_SIZE)
default_alloc_size= DEFAULT_ALLOC_SIZE;
@@ -139,7 +139,7 @@ void init_tree(TREE *tree, size_t default_alloc_size, size_t memory_limit,
static void free_tree(TREE *tree, myf free_flags)
{
DBUG_ENTER("free_tree");
- DBUG_PRINT("enter",("tree: 0x%lx", (long) tree));
+ DBUG_PRINT("enter",("tree: %p", tree));
if (tree->root) /* If initialized */
{
diff --git a/mysys/typelib.c b/mysys/typelib.c
index 96842b1a3ad..a256c26f048 100644
--- a/mysys/typelib.c
+++ b/mysys/typelib.c
@@ -88,7 +88,7 @@ static int find_type_eol(const char **x, const TYPELIB *typelib, uint flags,
const char *j;
CHARSET_INFO *cs= &my_charset_latin1;
DBUG_ENTER("find_type_eol");
- DBUG_PRINT("enter",("x: '%s' lib: 0x%lx", *x, (long) typelib));
+ DBUG_PRINT("enter",("x: '%s' lib: %p", *x, typelib));
DBUG_ASSERT(!(flags & ~(FIND_TYPE_NO_PREFIX | FIND_TYPE_COMMA_TERM)));
@@ -200,7 +200,7 @@ my_ulonglong find_typeset(char *x, TYPELIB *lib, int *err)
int find;
char *i;
DBUG_ENTER("find_set");
- DBUG_PRINT("enter",("x: '%s' lib: 0x%lx", x, (long) lib));
+ DBUG_PRINT("enter",("x: '%s' lib: %p", x, lib));
if (!lib->count)
{
diff --git a/mysys/wqueue.c b/mysys/wqueue.c
index 1dafc03b935..8bc28111655 100644
--- a/mysys/wqueue.c
+++ b/mysys/wqueue.c
@@ -224,17 +224,17 @@ void wqueue_add_and_wait(WQUEUE *wqueue,
{
DBUG_ENTER("wqueue_add_and_wait");
DBUG_PRINT("enter",
- ("thread: 0x%lx cond: 0x%lx mutex: 0x%lx",
- (ulong) thread, (ulong) &thread->suspend, (ulong) lock));
+ ("thread: %p cond: %p mutex: %p",
+ thread, &thread->suspend, lock));
wqueue_add_to_queue(wqueue, thread);
do
{
- DBUG_PRINT("info", ("wait... cond: 0x%lx mutex: 0x%lx",
- (ulong) &thread->suspend, (ulong) lock));
+ DBUG_PRINT("info", ("wait... cond: %p mutex: %p",
+ &thread->suspend, lock));
mysql_cond_wait(&thread->suspend, lock);
- DBUG_PRINT("info", ("wait done cond: 0x%lx mutex: 0x%lx next: 0x%lx",
- (ulong) &thread->suspend, (ulong) lock,
- (ulong) thread->next));
+ DBUG_PRINT("info", ("wait done cond: %p mutex: %p next: %p",
+ &thread->suspend, lock,
+ thread->next));
}
while (thread->next);
DBUG_VOID_RETURN;
diff --git a/mysys_ssl/my_sha.ic b/mysys_ssl/my_sha.ic
index a7ec8bad593..361a4d851e7 100644
--- a/mysys_ssl/my_sha.ic
+++ b/mysys_ssl/my_sha.ic
@@ -134,7 +134,7 @@ void my_sha(uchar *digest, const char *buf, size_t len)
CONTEXT context;
sha_init_fast(&context);
- sha_input(&context, (const uchar *)buf, len);
+ sha_input(&context, (const uchar *)buf, (unsigned int)len);
sha_result(&context, digest);
}
diff --git a/sql-common/client.c b/sql-common/client.c
index 2792c575aef..f3c100db900 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -952,7 +952,7 @@ void STDCALL
mysql_free_result(MYSQL_RES *result)
{
DBUG_ENTER("mysql_free_result");
- DBUG_PRINT("enter",("mysql_res: 0x%lx", (long) result));
+ DBUG_PRINT("enter",("mysql_res: %p", result));
if (result)
{
MYSQL *mysql= result->handle;
@@ -1653,7 +1653,7 @@ mysql_init(MYSQL *mysql)
*/
mysql->reconnect= 0;
- DBUG_PRINT("mysql",("mysql: 0x%lx", (long) mysql));
+ DBUG_PRINT("mysql",("mysql: %p", mysql));
return mysql;
}
@@ -3379,7 +3379,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
}
DBUG_PRINT("info",
("End of connect attempts, sock: %d status: %d error: %d",
- sock, status, saved_error));
+ (int)sock, status, saved_error));
freeaddrinfo(res_lst);
@@ -3633,7 +3633,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
}
#endif
- DBUG_PRINT("exit", ("Mysql handler: 0x%lx", (long) mysql));
+ DBUG_PRINT("exit", ("Mysql handler: %p",mysql));
DBUG_RETURN(mysql);
error:
@@ -3955,7 +3955,7 @@ void STDCALL mysql_close_slow_part(MYSQL *mysql)
void STDCALL mysql_close(MYSQL *mysql)
{
DBUG_ENTER("mysql_close");
- DBUG_PRINT("enter", ("mysql: 0x%lx", (long) mysql));
+ DBUG_PRINT("enter", ("mysql: %p", mysql));
if (mysql) /* Some simple safety */
{
@@ -4066,7 +4066,7 @@ int STDCALL
mysql_real_query(MYSQL *mysql, const char *query, ulong length)
{
DBUG_ENTER("mysql_real_query");
- DBUG_PRINT("enter",("handle: 0x%lx", (long) mysql));
+ DBUG_PRINT("enter",("handle: %p", mysql));
DBUG_PRINT("query",("Query = '%-.4096s'",query));
if (mysql_send_query(mysql,query,length))
diff --git a/sql/create_options.cc b/sql/create_options.cc
index 99562faa077..96893aa172e 100644
--- a/sql/create_options.cc
+++ b/sql/create_options.cc
@@ -124,8 +124,8 @@ static bool set_one_value(ha_create_table_option *opt,
MEM_ROOT *root)
{
DBUG_ENTER("set_one_value");
- DBUG_PRINT("enter", ("opt: 0x%lx type: %u name '%s' value: '%s'",
- (ulong) opt,
+ DBUG_PRINT("enter", ("opt: %p type: %u name '%s' value: '%s'",
+ opt,
opt->type, opt->name,
(value->str ? value->str : "<DEFAULT>")));
switch (opt->type)
diff --git a/sql/debug_sync.cc b/sql/debug_sync.cc
index ab022c770b8..4a4a93757ef 100644
--- a/sql/debug_sync.cc
+++ b/sql/debug_sync.cc
@@ -681,8 +681,8 @@ static st_debug_sync_action *debug_sync_get_action(THD *thd,
}
DBUG_ASSERT(action >= ds_control->ds_action);
DBUG_ASSERT(action < ds_control->ds_action + ds_control->ds_active);
- DBUG_PRINT("debug_sync", ("action: 0x%lx array: 0x%lx count: %u",
- (long) action, (long) ds_control->ds_action,
+ DBUG_PRINT("debug_sync", ("action: %p array: %p count: %u",
+ action, ds_control->ds_action,
ds_control->ds_active));
DBUG_RETURN(action);
diff --git a/sql/event_data_objects.cc b/sql/event_data_objects.cc
index 9e1ee6f30f9..86866edffd9 100644
--- a/sql/event_data_objects.cc
+++ b/sql/event_data_objects.cc
@@ -911,9 +911,9 @@ Event_queue_element::compute_next_execution_time()
{
my_time_t time_now;
DBUG_ENTER("Event_queue_element::compute_next_execution_time");
- DBUG_PRINT("enter", ("starts: %lu ends: %lu last_executed: %lu this: 0x%lx",
+ DBUG_PRINT("enter", ("starts: %lu ends: %lu last_executed: %lu this: %p",
(long) starts, (long) ends, (long) last_executed,
- (long) this));
+ this));
if (status != Event_parse_data::ENABLED)
{
diff --git a/sql/event_db_repository.cc b/sql/event_db_repository.cc
index ca4d93eb240..50bc84883a0 100644
--- a/sql/event_db_repository.cc
+++ b/sql/event_db_repository.cc
@@ -1060,7 +1060,7 @@ Event_db_repository::load_named_event(THD *thd, LEX_STRING dbname,
TABLE_LIST event_table;
DBUG_ENTER("Event_db_repository::load_named_event");
- DBUG_PRINT("enter",("thd: 0x%lx name: %*s", (long) thd,
+ DBUG_PRINT("enter",("thd: %p name: %*s", thd,
(int) name.length, name.str));
event_table.init_one_table("mysql", 5, "event", 5, "event", TL_READ);
@@ -1183,7 +1183,7 @@ Event_db_repository::check_system_tables(THD *thd)
const unsigned int event_priv_column_position= 29;
DBUG_ENTER("Event_db_repository::check_system_tables");
- DBUG_PRINT("enter", ("thd: 0x%lx", (long) thd));
+ DBUG_PRINT("enter", ("thd: %p", thd));
/* Check mysql.db */
tables.init_one_table("mysql", 5, "db", 2, "db", TL_READ);
diff --git a/sql/event_parse_data.cc b/sql/event_parse_data.cc
index 6c123c8e641..6fa0c25508e 100644
--- a/sql/event_parse_data.cc
+++ b/sql/event_parse_data.cc
@@ -497,9 +497,9 @@ Event_parse_data::check_parse_data(THD *thd)
{
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",
- (long) item_execute_at, (long) item_expression,
- (long) item_starts, (long) item_ends));
+ 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);
@@ -532,9 +532,9 @@ Event_parse_data::init_definer(THD *thd)
size_t definer_user_len= thd->lex->definer->user.length;
size_t definer_host_len= thd->lex->definer->host.length;
- DBUG_PRINT("info",("init definer_user thd->mem_root: 0x%lx "
- "definer_user: 0x%lx", (long) thd->mem_root,
- (long) definer_user));
+ DBUG_PRINT("info",("init definer_user thd->mem_root: %p "
+ "definer_user: %p", thd->mem_root,
+ definer_user));
/* + 1 for @ */
DBUG_PRINT("info",("init definer as whole"));
diff --git a/sql/event_queue.cc b/sql/event_queue.cc
index ae8ba258717..01a1507f6f2 100644
--- a/sql/event_queue.cc
+++ b/sql/event_queue.cc
@@ -135,7 +135,7 @@ bool
Event_queue::init_queue(THD *thd)
{
DBUG_ENTER("Event_queue::init_queue");
- DBUG_PRINT("enter", ("this: 0x%lx", (long) this));
+ DBUG_PRINT("enter", ("this: %p", this));
LOCK_QUEUE_DATA();
@@ -201,7 +201,7 @@ Event_queue::create_event(THD *thd, Event_queue_element *new_element,
bool *created)
{
DBUG_ENTER("Event_queue::create_event");
- DBUG_PRINT("enter", ("thd: 0x%lx et=%s.%s", (long) thd,
+ DBUG_PRINT("enter", ("thd: %p et=%s.%s", thd,
new_element->dbname.str, new_element->name.str));
/* Will do nothing if the event is disabled */
@@ -213,7 +213,7 @@ Event_queue::create_event(THD *thd, Event_queue_element *new_element,
DBUG_RETURN(FALSE);
}
- DBUG_PRINT("info", ("new event in the queue: 0x%lx", (long) new_element));
+ DBUG_PRINT("info", ("new event in the queue: %p", new_element));
LOCK_QUEUE_DATA();
*created= (queue_insert_safe(&queue, (uchar *) new_element) == FALSE);
@@ -242,7 +242,7 @@ Event_queue::update_event(THD *thd, LEX_STRING dbname, LEX_STRING name,
Event_queue_element *new_element)
{
DBUG_ENTER("Event_queue::update_event");
- DBUG_PRINT("enter", ("thd: 0x%lx et=[%s.%s]", (long) thd, dbname.str, name.str));
+ DBUG_PRINT("enter", ("thd: %p et=[%s.%s]", thd, dbname.str, name.str));
if ((new_element->status == Event_parse_data::DISABLED) ||
(new_element->status == Event_parse_data::SLAVESIDE_DISABLED))
@@ -264,7 +264,7 @@ Event_queue::update_event(THD *thd, LEX_STRING dbname, LEX_STRING name,
/* If not disabled event */
if (new_element)
{
- DBUG_PRINT("info", ("new event in the queue: 0x%lx", (long) new_element));
+ DBUG_PRINT("info", ("new event in the queue: %p", new_element));
queue_insert_safe(&queue, (uchar *) new_element);
mysql_cond_broadcast(&COND_queue_state);
}
@@ -290,7 +290,7 @@ void
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", (long) thd,
+ DBUG_PRINT("enter", ("thd: %p db :%s name: %s", thd,
dbname.str, name.str));
LOCK_QUEUE_DATA();
@@ -545,7 +545,7 @@ Event_queue::dbug_dump_queue(my_time_t when)
i++)
{
et= ((Event_queue_element*)queue_element(&queue, i));
- DBUG_PRINT("info", ("et: 0x%lx name: %s.%s", (long) et,
+ DBUG_PRINT("info", ("et: %p name: %s.%s", et,
et->dbname.str, et->name.str));
DBUG_PRINT("info", ("exec_at: %lu starts: %lu ends: %lu execs_so_far: %u "
"expr: %ld et.exec_at: %ld now: %ld "
@@ -673,8 +673,8 @@ Event_queue::get_top_for_execution_if_time(THD *thd,
end:
UNLOCK_QUEUE_DATA();
- DBUG_PRINT("info", ("returning %d et_new: 0x%lx ",
- ret, (long) *event_name));
+ DBUG_PRINT("info", ("returning %d et_new: %p ",
+ ret, *event_name));
if (*event_name)
{
diff --git a/sql/event_scheduler.cc b/sql/event_scheduler.cc
index 8ed5901b69a..57bbf0e1eea 100644
--- a/sql/event_scheduler.cc
+++ b/sql/event_scheduler.cc
@@ -295,7 +295,7 @@ Event_worker_thread::run(THD *thd, Event_queue_element_for_exec *event)
res= post_init_event_thread(thd);
DBUG_ENTER("Event_worker_thread::run");
- DBUG_PRINT("info", ("Time is %ld, THD: 0x%lx", (long) my_time(0), (long) thd));
+ DBUG_PRINT("info", ("Time is %u, THD: %p", (uint)my_time(0), thd));
inc_thread_running();
if (res)
@@ -420,7 +420,7 @@ Event_scheduler::start(int *err_no)
scheduler_thd= new_thd;
DBUG_PRINT("info", ("Setting state go RUNNING"));
state= RUNNING;
- DBUG_PRINT("info", ("Forking new thread for scheduler. THD: 0x%lx", (long) new_thd));
+ DBUG_PRINT("info", ("Forking new thread for scheduler. THD: %p", new_thd));
if ((*err_no= mysql_thread_create(key_thread_event_scheduler,
&th, &connection_attrib,
event_scheduler_thread,
@@ -485,7 +485,7 @@ Event_scheduler::run(THD *thd)
}
DBUG_PRINT("info", ("get_top_for_execution_if_time returned "
- "event_name=0x%lx", (long) event_name));
+ "event_name=%p", event_name));
if (event_name)
{
if ((res= execute_top(event_name)))
@@ -566,7 +566,7 @@ Event_scheduler::execute_top(Event_queue_element_for_exec *event_name)
started_events++;
executed_events++; // For SHOW STATUS
- DBUG_PRINT("info", ("Event is in THD: 0x%lx", (long) new_thd));
+ DBUG_PRINT("info", ("Event is in THD: %p", new_thd));
DBUG_RETURN(FALSE);
error:
@@ -617,7 +617,7 @@ Event_scheduler::stop()
{
THD *thd= current_thd;
DBUG_ENTER("Event_scheduler::stop");
- DBUG_PRINT("enter", ("thd: 0x%lx", (long) thd));
+ DBUG_PRINT("enter", ("thd: %p", thd));
LOCK_DATA();
DBUG_PRINT("info", ("state before action %s", scheduler_states_names[state].str));
diff --git a/sql/events.cc b/sql/events.cc
index ecba97649b7..11d54894d1d 100644
--- a/sql/events.cc
+++ b/sql/events.cc
@@ -1120,7 +1120,7 @@ Events::load_events_from_db(THD *thd)
uint count= 0;
ulong saved_master_access;
DBUG_ENTER("Events::load_events_from_db");
- DBUG_PRINT("enter", ("thd: 0x%lx", (long) thd));
+ DBUG_PRINT("enter", ("thd: %p", thd));
/*
NOTE: even if we run in read-only mode, we should be able to lock the
diff --git a/sql/field.cc b/sql/field.cc
index a18bb808573..50c372bf53d 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -8361,8 +8361,8 @@ const uchar *Field_blob::unpack(uchar *to, const uchar *from,
const uchar *from_end, uint param_data)
{
DBUG_ENTER("Field_blob::unpack");
- DBUG_PRINT("enter", ("to: 0x%lx; from: 0x%lx; param_data: %u",
- (ulong) to, (ulong) from, param_data));
+ DBUG_PRINT("enter", ("to: %p; from: %p; param_data: %u",
+ to, from, param_data));
uint const master_packlength=
param_data > 0 ? param_data & 0xFF : packlength;
if (from + master_packlength > from_end)
@@ -9216,8 +9216,8 @@ Field_bit::do_last_null_byte() const
bits. On systems with CHAR_BIT > 8 (not very common), the storage
will lose the extra bits.
*/
- DBUG_PRINT("test", ("bit_ofs: %d, bit_len: %d bit_ptr: 0x%lx",
- bit_ofs, bit_len, (long) bit_ptr));
+ DBUG_PRINT("test", ("bit_ofs: %d, bit_len: %d bit_ptr: %p",
+ bit_ofs, bit_len, bit_ptr));
uchar *result;
if (bit_len == 0)
result= null_ptr;
diff --git a/sql/gen_lex_token.cc b/sql/gen_lex_token.cc
index eefe9163819..bd2b9728177 100644
--- a/sql/gen_lex_token.cc
+++ b/sql/gen_lex_token.cc
@@ -79,7 +79,7 @@ void set_token(int tok, const char *str)
}
compiled_token_array[tok].m_token_string= str;
- compiled_token_array[tok].m_token_length= strlen(str);
+ compiled_token_array[tok].m_token_length= (int)strlen(str);
compiled_token_array[tok].m_append_space= true;
compiled_token_array[tok].m_start_expr= false;
}
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index 54c777975e0..4375e891f1f 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -4803,8 +4803,8 @@ int ha_partition::rnd_init(bool scan)
}
/* Now we see what the index of our first important partition is */
- DBUG_PRINT("info", ("m_part_info->read_partitions: 0x%lx",
- (long) m_part_info->read_partitions.bitmap));
+ DBUG_PRINT("info", ("m_part_info->read_partitions: %p",
+ m_part_info->read_partitions.bitmap));
part_id= bitmap_get_first_set(&(m_part_info->read_partitions));
DBUG_PRINT("info", ("m_part_spec.start_part %d", part_id));
diff --git a/sql/handler.cc b/sql/handler.cc
index 034a3f5f750..e87ee03d0ee 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -257,7 +257,7 @@ handler *get_new_handler(TABLE_SHARE *share, MEM_ROOT *alloc,
{
handler *file;
DBUG_ENTER("get_new_handler");
- DBUG_PRINT("enter", ("alloc: 0x%lx", (long) alloc));
+ DBUG_PRINT("enter", ("alloc: %p", alloc));
if (db_type && db_type->state == SHOW_OPTION_YES && db_type->create)
{
@@ -3191,8 +3191,8 @@ void handler::column_bitmaps_signal()
{
DBUG_ENTER("column_bitmaps_signal");
if (table)
- DBUG_PRINT("info", ("read_set: 0x%lx write_set: 0x%lx",
- (long) table->read_set, (long) table->write_set));
+ DBUG_PRINT("info", ("read_set: %p write_set: %p",
+ table->read_set, table->write_set));
DBUG_VOID_RETURN;
}
@@ -5741,9 +5741,9 @@ bool handler::check_table_binlog_row_based_internal(bool binlog_row)
static int write_locked_table_maps(THD *thd)
{
DBUG_ENTER("write_locked_table_maps");
- DBUG_PRINT("enter", ("thd: 0x%lx thd->lock: 0x%lx "
- "thd->extra_lock: 0x%lx",
- (long) thd, (long) thd->lock, (long) thd->extra_lock));
+ DBUG_PRINT("enter", ("thd:%p thd->lock:%p "
+ "thd->extra_lock: %p",
+ thd, thd->lock, thd->extra_lock));
DBUG_PRINT("debug", ("get_binlog_table_maps(): %d", thd->get_binlog_table_maps()));
diff --git a/sql/item.cc b/sql/item.cc
index 1b29b3edf50..74c5d94ec98 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -6293,8 +6293,8 @@ void Item_field::save_org_in_field(Field *to,
fast_field_copier fast_field_copier_func)
{
DBUG_ENTER("Item_field::save_org_in_field");
- DBUG_PRINT("enter", ("setup: 0x%lx data: 0x%lx",
- (ulong) to, (ulong) fast_field_copier_func));
+ DBUG_PRINT("enter", ("setup: %p data: %p",
+ to, fast_field_copier_func));
if (fast_field_copier_func)
{
if (field->is_null())
diff --git a/sql/item.h b/sql/item.h
index 3bf1fd1113c..38bbd6edcd5 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -3438,7 +3438,7 @@ public:
DERIVATION_COERCIBLE, MY_REPERTOIRE_ASCII)
{ }
Item_string_ascii(THD *thd, const char *str):
- Item_string(thd, str, strlen(str), &my_charset_latin1,
+ Item_string(thd, str, (uint)strlen(str), &my_charset_latin1,
DERIVATION_COERCIBLE, MY_REPERTOIRE_ASCII)
{ }
};
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index da50bd13352..9a8a158f9e6 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -3744,7 +3744,7 @@ uchar *in_row::get_value(Item *item)
void in_row::set(uint pos, Item *item)
{
DBUG_ENTER("in_row::set");
- DBUG_PRINT("enter", ("pos: %u item: 0x%lx", pos, (ulong) item));
+ DBUG_PRINT("enter", ("pos: %u item: %p", pos,item));
((cmp_item_row*) base)[pos].store_value_by_template(current_thd, &tmp, item);
DBUG_VOID_RETURN;
}
@@ -3909,7 +3909,7 @@ cmp_item* cmp_item_row::make_same()
cmp_item_row::~cmp_item_row()
{
DBUG_ENTER("~cmp_item_row");
- DBUG_PRINT("enter",("this: 0x%lx", (long) this));
+ DBUG_PRINT("enter",("this: %p", this));
if (comparators)
{
for (uint i= 0; i < n; i++)
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index 191380b38b1..29433be4af8 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -58,7 +58,7 @@ Item_subselect::Item_subselect(THD *thd_arg):
changed(0), is_correlated(FALSE), with_recursive_reference(0)
{
DBUG_ENTER("Item_subselect::Item_subselect");
- DBUG_PRINT("enter", ("this: 0x%lx", (ulong) this));
+ DBUG_PRINT("enter", ("this: %p", this));
sortbuffer.str= 0;
#ifndef DBUG_OFF
@@ -84,8 +84,8 @@ void Item_subselect::init(st_select_lex *select_lex,
*/
DBUG_ENTER("Item_subselect::init");
- DBUG_PRINT("enter", ("select_lex: 0x%lx this: 0x%lx",
- (ulong) select_lex, (ulong) this));
+ DBUG_PRINT("enter", ("select_lex: %p this: %p",
+ select_lex, this));
unit= select_lex->master_unit();
if (unit->item)
@@ -130,7 +130,7 @@ void Item_subselect::init(st_select_lex *select_lex,
/* The subquery is an expression cache candidate */
upper->expr_cache_may_be_used[upper->parsing_place]= TRUE;
}
- DBUG_PRINT("info", ("engine: 0x%lx", (ulong)engine));
+ DBUG_PRINT("info", ("engine: %p", engine));
DBUG_VOID_RETURN;
}
@@ -215,7 +215,7 @@ void Item_allany_subselect::cleanup()
Item_subselect::~Item_subselect()
{
DBUG_ENTER("Item_subselect::~Item_subselect");
- DBUG_PRINT("enter", ("this: 0x%lx", (ulong) this));
+ DBUG_PRINT("enter", ("this: %p", this));
if (own_engine)
delete engine;
else
diff --git a/sql/log.cc b/sql/log.cc
index de501d94100..a249f102dbd 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -5611,8 +5611,8 @@ int THD::binlog_write_table_map(TABLE *table, bool is_transactional,
{
int error;
DBUG_ENTER("THD::binlog_write_table_map");
- DBUG_PRINT("enter", ("table: 0x%lx (%s: #%lu)",
- (long) table, table->s->table_name.str,
+ DBUG_PRINT("enter", ("table: %p (%s: #%lu)",
+ table, table->s->table_name.str,
table->s->table_map_id));
/* Ensure that all events in a GTID group are in the same cache */
@@ -5763,7 +5763,7 @@ MYSQL_BIN_LOG::flush_and_set_pending_rows_event(THD *thd,
{
DBUG_ENTER("MYSQL_BIN_LOG::flush_and_set_pending_rows_event(event)");
DBUG_ASSERT(WSREP_EMULATE_BINLOG(thd) || mysql_bin_log.is_open());
- DBUG_PRINT("enter", ("event: 0x%lx", (long) event));
+ DBUG_PRINT("enter", ("event: %p", event));
int error= 0;
binlog_cache_mngr *const cache_mngr=
@@ -5774,7 +5774,7 @@ MYSQL_BIN_LOG::flush_and_set_pending_rows_event(THD *thd,
binlog_cache_data *cache_data=
cache_mngr->get_binlog_cache_data(use_trans_cache(thd, is_transactional));
- DBUG_PRINT("info", ("cache_mngr->pending(): 0x%lx", (long) cache_data->pending()));
+ DBUG_PRINT("info", ("cache_mngr->pending(): %p", cache_data->pending()));
if (Rows_log_event* pending= cache_data->pending())
{
diff --git a/sql/log_event.cc b/sql/log_event.cc
index b4fdd9eb8e7..19bb3a51671 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -2427,9 +2427,9 @@ void Log_event::print_header(IO_CACHE* file,
if (checksum_alg != BINLOG_CHECKSUM_ALG_OFF &&
checksum_alg != BINLOG_CHECKSUM_ALG_UNDEF)
{
- char checksum_buf[BINLOG_CHECKSUM_LEN * 2 + 4]; // to fit to "0x%lx "
+ char checksum_buf[BINLOG_CHECKSUM_LEN * 2 + 4]; // to fit to "%p "
size_t const bytes_written=
- my_snprintf(checksum_buf, sizeof(checksum_buf), "0x%08lx ", (ulong) crc);
+ my_snprintf(checksum_buf, sizeof(checksum_buf), "0x%08x ", crc);
my_b_printf(file, "%s ", get_type(&binlog_checksum_typelib, checksum_alg));
my_b_printf(file, checksum_buf, bytes_written);
}
@@ -4345,8 +4345,8 @@ Query_log_event::Query_log_event(const char* buf, uint event_len,
break;
}
case Q_CATALOG_NZ_CODE:
- DBUG_PRINT("info", ("case Q_CATALOG_NZ_CODE; pos: 0x%lx; end: 0x%lx",
- (ulong) pos, (ulong) end));
+ DBUG_PRINT("info", ("case Q_CATALOG_NZ_CODE; pos:%p; end:%p",
+ pos, end));
if (get_str_len_and_pointer(&pos, &catalog, &catalog_len, end))
{
DBUG_PRINT("info", ("query= 0"));
@@ -10456,7 +10456,7 @@ int Rows_log_event::do_add_row_data(uchar *row_data, size_t length)
would save binlog space. TODO
*/
DBUG_ENTER("Rows_log_event::do_add_row_data");
- DBUG_PRINT("enter", ("row_data: 0x%lx length: %lu", (ulong) row_data,
+ DBUG_PRINT("enter", ("row_data:%p length: %lu", row_data,
(ulong) length));
/*
@@ -10836,8 +10836,8 @@ int Rows_log_event::do_apply_event(rpl_group_info *rgi)
table= m_table= rgi->m_table_map.get_table(m_table_id);
- DBUG_PRINT("debug", ("m_table: 0x%lx, m_table_id: %lu%s",
- (ulong) m_table, m_table_id,
+ DBUG_PRINT("debug", ("m_table:%p, m_table_id: %lu%s",
+ m_table, m_table_id,
table && master_had_triggers ?
" (master had triggers)" : ""));
if (table)
@@ -10957,8 +10957,8 @@ int Rows_log_event::do_apply_event(rpl_group_info *rgi)
m_curr_row_end.
*/
- DBUG_PRINT("info", ("curr_row: 0x%lu; curr_row_end: 0x%lu; rows_end: 0x%lu",
- (ulong) m_curr_row, (ulong) m_curr_row_end, (ulong) m_rows_end));
+ DBUG_PRINT("info", ("curr_row: %p; curr_row_end: %p; rows_end:%p",
+ m_curr_row, m_curr_row_end, m_rows_end));
if (!m_curr_row_end && !error)
error= unpack_current_row(rgi);
diff --git a/sql/log_event_old.cc b/sql/log_event_old.cc
index 8f1cfe17656..36c4a3867b2 100644
--- a/sql/log_event_old.cc
+++ b/sql/log_event_old.cc
@@ -364,10 +364,10 @@ copy_extra_record_fields(TABLE *table,
my_ptrdiff_t master_fields)
{
DBUG_ENTER("copy_extra_record_fields(table, master_reclen, master_fields)");
- DBUG_PRINT("info", ("Copying to 0x%lx "
+ DBUG_PRINT("info", ("Copying to %p "
"from field %lu at offset %lu "
"to field %d at offset %lu",
- (long) table->record[0],
+ table->record[0],
(ulong) master_fields, (ulong) master_reclength,
table->s->fields, table->s->reclength));
/*
@@ -625,8 +625,8 @@ replace_record(THD *thd, TABLE *table,
static int find_and_fetch_row(TABLE *table, uchar *key)
{
DBUG_ENTER("find_and_fetch_row(TABLE *table, uchar *key, uchar *record)");
- DBUG_PRINT("enter", ("table: 0x%lx, key: 0x%lx record: 0x%lx",
- (long) table, (long) key, (long) table->record[1]));
+ DBUG_PRINT("enter", ("table: %p, key: %p record: %p",
+ table, key, table->record[1]));
DBUG_ASSERT(table->in_use != NULL);
@@ -1254,8 +1254,8 @@ Old_rows_log_event::Old_rows_log_event(const char *buf, uint event_len,
const uchar* const ptr_rows_data= (const uchar*) ptr_after_width;
size_t const data_size= event_len - (ptr_rows_data - (const uchar *) buf);
- DBUG_PRINT("info",("m_table_id: %lu m_flags: %d m_width: %lu data_size: %lu",
- m_table_id, m_flags, m_width, (ulong) data_size));
+ DBUG_PRINT("info",("m_table_id: %lu m_flags: %d m_width: %lu data_size: %zu",
+ m_table_id, m_flags, m_width, data_size));
DBUG_DUMP("rows_data", (uchar*) ptr_rows_data, data_size);
m_rows_buf= (uchar*) my_malloc(data_size, MYF(MY_WME));
@@ -1310,8 +1310,8 @@ int Old_rows_log_event::do_add_row_data(uchar *row_data, size_t length)
would save binlog space. TODO
*/
DBUG_ENTER("Old_rows_log_event::do_add_row_data");
- DBUG_PRINT("enter", ("row_data: 0x%lx length: %lu", (ulong) row_data,
- (ulong) length));
+ DBUG_PRINT("enter", ("row_data: %p length: %zu",row_data,
+ length));
/*
Don't print debug messages when running valgrind since they can
trigger false warnings.
@@ -1599,8 +1599,8 @@ int Old_rows_log_event::do_apply_event(rpl_group_info *rgi)
*/
DBUG_PRINT("info", ("error: %d", error));
- DBUG_PRINT("info", ("curr_row: 0x%lu; curr_row_end: 0x%lu; rows_end: 0x%lu",
- (ulong) m_curr_row, (ulong) m_curr_row_end, (ulong) m_rows_end));
+ DBUG_PRINT("info", ("curr_row: %p; curr_row_end:%p; rows_end: %p",
+ m_curr_row, m_curr_row_end, m_rows_end));
if (!m_curr_row_end && !error)
unpack_current_row(rgi);
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index e552d0b05a6..05e25d99e13 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1594,8 +1594,8 @@ static void close_connections(void)
/* kill connection thread */
#if !defined(__WIN__)
- DBUG_PRINT("quit", ("waiting for select thread: 0x%lx",
- (ulong) select_thread));
+ DBUG_PRINT("quit", ("waiting for select thread: %lu",
+ (ulong)select_thread));
mysql_mutex_lock(&LOCK_start_thread);
while (select_thread_in_use)
@@ -2893,7 +2893,7 @@ void signal_thd_deleted()
void unlink_thd(THD *thd)
{
DBUG_ENTER("unlink_thd");
- DBUG_PRINT("enter", ("thd: 0x%lx", (long) thd));
+ DBUG_PRINT("enter", ("thd: %p", thd));
/*
Do not decrement when its wsrep system thread. wsrep_applier is set for
@@ -4848,7 +4848,7 @@ static void init_ssl()
opt_ssl_ca, opt_ssl_capath,
opt_ssl_cipher, &error,
opt_ssl_crl, opt_ssl_crlpath);
- DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd));
+ DBUG_PRINT("info",("ssl_acceptor_fd: %p", ssl_acceptor_fd));
if (!ssl_acceptor_fd)
{
sql_print_warning("Failed to setup SSL");
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index c15810ba686..f8f1d0a3efd 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -1321,7 +1321,7 @@ QUICK_RANGE_SELECT::~QUICK_RANGE_SELECT()
file->ha_end_keyread();
if (free_file)
{
- DBUG_PRINT("info", ("Freeing separate handler 0x%lx (free: %d)", (long) file,
+ DBUG_PRINT("info", ("Freeing separate handler %p (free: %d)", file,
free_file));
file->ha_external_lock(current_thd, F_UNLCK);
file->ha_close();
@@ -1483,7 +1483,7 @@ int QUICK_RANGE_SELECT::init_ror_merged_scan(bool reuse_handler,
in_ror_merged_scan= 1;
if (reuse_handler)
{
- DBUG_PRINT("info", ("Reusing handler 0x%lx", (long) file));
+ DBUG_PRINT("info", ("Reusing handler %p", file));
if (init())
{
DBUG_RETURN(1);
@@ -10217,7 +10217,7 @@ void SEL_ARG::test_use_count(SEL_ARG *root)
ulong count=count_key_part_usage(root,pos->next_key_part);
if (count > pos->next_key_part->use_count)
{
- sql_print_information("Use_count: Wrong count for key at 0x%lx, %lu "
+ sql_print_information("Use_count: Wrong count for key at %p, %lu "
"should be %lu", (long unsigned int)pos,
pos->next_key_part->use_count, count);
return;
@@ -10226,7 +10226,7 @@ void SEL_ARG::test_use_count(SEL_ARG *root)
}
}
if (e_count != elements)
- sql_print_warning("Wrong use count: %u (should be %u) for tree at 0x%lx",
+ sql_print_warning("Wrong use count: %u (should be %u) for tree at %p",
e_count, elements, (long unsigned int) this);
}
#endif
@@ -14612,7 +14612,7 @@ static void print_sel_tree(PARAM *param, SEL_TREE *tree, key_map *tree_map,
if (!tmp.length())
tmp.append(STRING_WITH_LEN("(empty)"));
- DBUG_PRINT("info", ("SEL_TREE: 0x%lx (%s) scans: %s", (long) tree, msg,
+ DBUG_PRINT("info", ("SEL_TREE: %p (%s) scans: %s", tree, msg,
tmp.c_ptr_safe()));
DBUG_VOID_RETURN;
diff --git a/sql/parse_file.cc b/sql/parse_file.cc
index 1cd294c1c7a..8f3e26d5e03 100644
--- a/sql/parse_file.cc
+++ b/sql/parse_file.cc
@@ -258,9 +258,9 @@ sql_create_definition_file(const LEX_STRING *dir, const LEX_STRING *file_name,
int path_end;
File_option *param;
DBUG_ENTER("sql_create_definition_file");
- DBUG_PRINT("enter", ("Dir: %s, file: %s, base 0x%lx",
+ DBUG_PRINT("enter", ("Dir: %s, file: %s, base %p",
dir ? dir->str : "",
- file_name->str, (ulong) base));
+ file_name->str, base));
if (dir)
{
diff --git a/sql/rpl_record.cc b/sql/rpl_record.cc
index 0ef13c2cbb7..44d407e0a60 100644
--- a/sql/rpl_record.cc
+++ b/sql/rpl_record.cc
@@ -105,10 +105,10 @@ pack_row(TABLE *table, MY_BITMAP const* cols,
#endif
pack_ptr= field->pack(pack_ptr, field->ptr + offset,
field->max_data_length());
- DBUG_PRINT("debug", ("field: %s; real_type: %d, pack_ptr: 0x%lx;"
- " pack_ptr':0x%lx; bytes: %d",
+ DBUG_PRINT("debug", ("field: %s; real_type: %d, pack_ptr: %p;"
+ " pack_ptr':%p; bytes: %d",
field->field_name, field->real_type(),
- (ulong) old_pack_ptr, (ulong) pack_ptr,
+ old_pack_ptr,pack_ptr,
(int) (pack_ptr - old_pack_ptr)));
DBUG_DUMP("packed_data", old_pack_ptr, pack_ptr - old_pack_ptr);
}
@@ -322,9 +322,9 @@ unpack_row(rpl_group_info *rgi,
pack_ptr= f->unpack(f->ptr, pack_ptr, row_end, metadata);
DBUG_PRINT("debug", ("field: %s; metadata: 0x%x;"
- " pack_ptr: 0x%lx; pack_ptr': 0x%lx; bytes: %d",
+ " pack_ptr: %p; pack_ptr': %p; bytes: %d",
f->field_name, metadata,
- (ulong) old_pack_ptr, (ulong) pack_ptr,
+ old_pack_ptr, pack_ptr,
(int) (pack_ptr - old_pack_ptr)));
if (!pack_ptr)
{
@@ -336,8 +336,8 @@ unpack_row(rpl_group_info *rgi,
Galera Node throws "Could not read field" error and drops out of cluster
*/
WSREP_WARN("ROW event unpack field: %s metadata: 0x%x;"
- " pack_ptr: 0x%lx; conv_table %p conv_field %p table %s"
- " row_end: 0x%lx",
+ " pack_ptr: %p; conv_table %p conv_field %p table %s"
+ " row_end: %p",
f->field_name, metadata,
(ulong) old_pack_ptr, conv_table, conv_field,
(table_found) ? "found" : "not found", (ulong)row_end
diff --git a/sql/rpl_tblmap.cc b/sql/rpl_tblmap.cc
index 4c521cf0c16..48111bc5d0a 100644
--- a/sql/rpl_tblmap.cc
+++ b/sql/rpl_tblmap.cc
@@ -66,8 +66,8 @@ TABLE* table_mapping::get_table(ulong table_id)
entry *e= find_entry(table_id);
if (e)
{
- DBUG_PRINT("info", ("tid %lu -> table 0x%lx (%s)",
- table_id, (long) e->table,
+ DBUG_PRINT("info", ("tid %lu -> table %p (%s)",
+ table_id, e->table,
MAYBE_TABLE_NAME(e->table)));
DBUG_RETURN(e->table);
}
@@ -105,9 +105,9 @@ int table_mapping::expand()
int table_mapping::set_table(ulong table_id, TABLE* table)
{
DBUG_ENTER("table_mapping::set_table(ulong,TABLE*)");
- DBUG_PRINT("enter", ("table_id: %lu table: 0x%lx (%s)",
+ DBUG_PRINT("enter", ("table_id: %lu table: %p (%s)",
table_id,
- (long) table, MAYBE_TABLE_NAME(table)));
+ table, MAYBE_TABLE_NAME(table)));
entry *e= find_entry(table_id);
if (e == 0)
{
@@ -133,8 +133,8 @@ int table_mapping::set_table(ulong table_id, TABLE* table)
DBUG_RETURN(ERR_MEMORY_ALLOCATION);
}
- DBUG_PRINT("info", ("tid %lu -> table 0x%lx (%s)",
- table_id, (long) e->table,
+ DBUG_PRINT("info", ("tid %lu -> table %p (%s)",
+ table_id, e->table,
MAYBE_TABLE_NAME(e->table)));
DBUG_RETURN(0); // All OK
}
diff --git a/sql/slave.cc b/sql/slave.cc
index 828f74772ef..3fb28b587a6 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -3462,11 +3462,11 @@ sql_delay_event(Log_event *ev, THD *thd, rpl_group_info *rgi)
"ev->when= %lu "
"rli->mi->clock_diff_with_master= %lu "
"now= %ld "
- "sql_delay_end= %lu "
+ "sql_delay_end= %llu "
"nap_time= %ld",
sql_delay, (long)ev->when,
rli->mi->clock_diff_with_master,
- (long)now, sql_delay_end, (long)nap_time));
+ (long)now, (ulonglong)sql_delay_end, (long)nap_time));
if (sql_delay_end > now)
{
diff --git a/sql/sp.cc b/sql/sp.cc
index a31b2a2cfc5..fcbf4dc43d4 100644
--- a/sql/sp.cc
+++ b/sql/sp.cc
@@ -1754,11 +1754,11 @@ sp_find_routine(THD *thd, stored_procedure_type type, sp_name *name,
String retstr(64);
retstr.set_charset(sp->get_creation_ctx()->get_client_cs());
- DBUG_PRINT("info", ("found: 0x%lx", (ulong)sp));
+ DBUG_PRINT("info", ("found:%p", sp));
if (sp->m_first_free_instance)
{
- DBUG_PRINT("info", ("first free: 0x%lx level: %lu flags %x",
- (ulong)sp->m_first_free_instance,
+ DBUG_PRINT("info", ("first free:%p level: %lu flags %x",
+ sp->m_first_free_instance,
sp->m_first_free_instance->m_recursion_level,
sp->m_first_free_instance->m_flags));
DBUG_ASSERT(!(sp->m_first_free_instance->m_flags & sp_head::IS_INVOKED));
@@ -1798,8 +1798,8 @@ sp_find_routine(THD *thd, stored_procedure_type type, sp_name *name,
new_sp->m_recursion_level= level;
new_sp->m_first_instance= sp;
sp->m_last_cached_sp= sp->m_first_free_instance= new_sp;
- DBUG_PRINT("info", ("added level: 0x%lx, level: %lu, flags %x",
- (ulong)new_sp, new_sp->m_recursion_level,
+ DBUG_PRINT("info", ("added level:%p, level: %lu, flags %x",
+ new_sp, new_sp->m_recursion_level,
new_sp->m_flags));
DBUG_RETURN(new_sp);
}
@@ -1810,8 +1810,8 @@ sp_find_routine(THD *thd, stored_procedure_type type, sp_name *name,
if (db_find_routine(thd, type, name, &sp) == SP_OK)
{
sp_cache_insert(cp, sp);
- DBUG_PRINT("info", ("added new: 0x%lx, level: %lu, flags %x",
- (ulong)sp, sp->m_recursion_level,
+ DBUG_PRINT("info", ("added new:%p, level: %lu, flags %x",
+ sp, sp->m_recursion_level,
sp->m_flags));
}
}
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index 473e1929369..b3edcdca474 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -549,7 +549,7 @@ sp_head::operator new(size_t size) throw()
if (sp == NULL)
DBUG_RETURN(NULL);
sp->main_mem_root= own_root;
- DBUG_PRINT("info", ("mem_root 0x%lx", (ulong) &sp->mem_root));
+ DBUG_PRINT("info", ("mem_root %p", &sp->mem_root));
DBUG_RETURN(sp);
}
@@ -566,8 +566,8 @@ sp_head::operator delete(void *ptr, size_t size) throw()
/* Make a copy of main_mem_root as free_root will free the sp */
own_root= sp->main_mem_root;
- DBUG_PRINT("info", ("mem_root 0x%lx moved to 0x%lx",
- (ulong) &sp->mem_root, (ulong) &own_root));
+ DBUG_PRINT("info", ("mem_root %p moved to %p",
+ &sp->mem_root, &own_root));
free_root(&own_root, MYF(0));
DBUG_VOID_RETURN;
@@ -1154,9 +1154,9 @@ sp_head::execute(THD *thd, bool merge_da_on_success)
if (m_next_cached_sp)
{
DBUG_PRINT("info",
- ("first free for 0x%lx ++: 0x%lx->0x%lx level: %lu flags %x",
- (ulong)m_first_instance, (ulong) this,
- (ulong) m_next_cached_sp,
+ ("first free for %p ++: %p->%p level: %lu flags %x",
+ m_first_instance, this,
+ m_next_cached_sp,
m_next_cached_sp->m_recursion_level,
m_next_cached_sp->m_flags));
}
@@ -1454,10 +1454,10 @@ sp_head::execute(THD *thd, bool merge_da_on_success)
}
m_flags&= ~IS_INVOKED;
DBUG_PRINT("info",
- ("first free for 0x%lx --: 0x%lx->0x%lx, level: %lu, flags %x",
- (ulong) m_first_instance,
- (ulong) m_first_instance->m_first_free_instance,
- (ulong) this, m_recursion_level, m_flags));
+ ("first free for %p --: %p->%p, level: %lu, flags %x",
+ m_first_instance,
+ m_first_instance->m_first_free_instance,
+ this, m_recursion_level, m_flags));
/*
Check that we have one of following:
@@ -2346,8 +2346,8 @@ sp_head::backpatch(sp_label *lab)
{
if (bp->lab == lab)
{
- DBUG_PRINT("info", ("backpatch: (m_ip %d, label 0x%lx <%s>) to dest %d",
- bp->instr->m_ip, (ulong) lab, lab->name.str, dest));
+ DBUG_PRINT("info", ("backpatch: (m_ip %d, label %p <%s>) to dest %d",
+ bp->instr->m_ip, lab, lab->name.str, dest));
bp->instr->backpatch(dest, lab->ctx);
}
}
@@ -2483,8 +2483,8 @@ sp_head::reset_thd_mem_root(THD *thd)
DBUG_ENTER("sp_head::reset_thd_mem_root");
m_thd_root= thd->mem_root;
thd->mem_root= &main_mem_root;
- DBUG_PRINT("info", ("mem_root 0x%lx moved to thd mem root 0x%lx",
- (ulong) &mem_root, (ulong) &thd->mem_root));
+ DBUG_PRINT("info", ("mem_root %p moved to thd mem root %p",
+ &mem_root, &thd->mem_root));
free_list= thd->free_list; // Keep the old list
thd->free_list= NULL; // Start a new one
m_thd= thd;
@@ -2514,8 +2514,8 @@ sp_head::restore_thd_mem_root(THD *thd)
set_query_arena(thd); // Get new free_list and mem_root
state= STMT_INITIALIZED_FOR_SP;
- DBUG_PRINT("info", ("mem_root 0x%lx returned from thd mem root 0x%lx",
- (ulong) &mem_root, (ulong) &thd->mem_root));
+ DBUG_PRINT("info", ("mem_root %p returned from thd mem root %p",
+ &mem_root, &thd->mem_root));
thd->free_list= flist; // Restore the old one
thd->mem_root= m_thd_root;
m_thd= NULL;
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc
index 95c2163f043..fcbcd5d31bf 100644
--- a/sql/sql_admin.cc
+++ b/sql/sql_admin.cc
@@ -585,7 +585,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
}
}
#endif
- DBUG_PRINT("admin", ("table: 0x%lx", (long) table->table));
+ DBUG_PRINT("admin", ("table: %p", table->table));
if (prepare_func)
{
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 5ecb897b295..22bb837e6c0 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -716,8 +716,8 @@ void close_thread_tables(THD *thd)
#ifdef EXTRA_DEBUG
DBUG_PRINT("tcache", ("open tables:"));
for (table= thd->open_tables; table; table= table->next)
- DBUG_PRINT("tcache", ("table: '%s'.'%s' 0x%lx", table->s->db.str,
- table->s->table_name.str, (long) table));
+ DBUG_PRINT("tcache", ("table: '%s'.'%s' %p", table->s->db.str,
+ table->s->table_name.str, table));
#endif
#if defined(ENABLED_DEBUG_SYNC)
@@ -857,8 +857,8 @@ void close_thread_table(THD *thd, TABLE **table_ptr)
{
TABLE *table= *table_ptr;
DBUG_ENTER("close_thread_table");
- DBUG_PRINT("tcache", ("table: '%s'.'%s' 0x%lx", table->s->db.str,
- table->s->table_name.str, (long) table));
+ DBUG_PRINT("tcache", ("table: '%s'.'%s' %p", table->s->db.str,
+ table->s->table_name.str, table));
DBUG_ASSERT(!table->file->keyread_enabled());
DBUG_ASSERT(!table->file || table->file->inited == handler::NONE);
@@ -1192,8 +1192,8 @@ bool wait_while_table_is_used(THD *thd, TABLE *table,
{
DBUG_ENTER("wait_while_table_is_used");
DBUG_ASSERT(!table->s->tmp_table);
- DBUG_PRINT("enter", ("table: '%s' share: 0x%lx db_stat: %u version: %lu",
- table->s->table_name.str, (ulong) table->s,
+ DBUG_PRINT("enter", ("table: '%s' share: %p db_stat: %u version: %lu",
+ table->s->table_name.str, table->s,
table->db_stat, table->s->tdc->version));
if (thd->mdl_context.upgrade_shared_lock(
@@ -5188,8 +5188,8 @@ find_field_in_view(THD *thd, TABLE_LIST *table_list,
{
DBUG_ENTER("find_field_in_view");
DBUG_PRINT("enter",
- ("view: '%s', field name: '%s', item name: '%s', ref 0x%lx",
- table_list->alias, name, item_name, (ulong) ref));
+ ("view: '%s', field name: '%s', item name: '%s', ref %p",
+ table_list->alias, name, item_name, ref));
Field_iterator_view field_it;
field_it.set(table_list);
Query_arena *arena= 0, backup;
@@ -5290,8 +5290,8 @@ find_field_in_natural_join(THD *thd, TABLE_LIST *table_ref, const char *name,
Field *UNINIT_VAR(found_field);
Query_arena *UNINIT_VAR(arena), backup;
DBUG_ENTER("find_field_in_natural_join");
- DBUG_PRINT("enter", ("field name: '%s', ref 0x%lx",
- name, (ulong) ref));
+ DBUG_PRINT("enter", ("field name: '%s', ref %p",
+ name, ref));
DBUG_ASSERT(table_ref->is_natural_join && table_ref->join_columns);
DBUG_ASSERT(*actual_table == NULL);
@@ -5521,8 +5521,8 @@ find_field_in_table_ref(THD *thd, TABLE_LIST *table_list,
DBUG_ASSERT(name);
DBUG_ASSERT(item_name);
DBUG_PRINT("enter",
- ("table: '%s' field name: '%s' item name: '%s' ref 0x%lx",
- table_list->alias, name, item_name, (ulong) ref));
+ ("table: '%s' field name: '%s' item name: '%s' ref %p",
+ table_list->alias, name, item_name, ref));
/*
Check that the table and database that qualify the current field name
@@ -7412,7 +7412,7 @@ insert_fields(THD *thd, Name_resolution_context *context, const char *db_name,
bool found;
char name_buff[SAFE_NAME_LEN+1];
DBUG_ENTER("insert_fields");
- DBUG_PRINT("arena", ("stmt arena: 0x%lx", (ulong)thd->stmt_arena));
+ DBUG_PRINT("arena", ("stmt arena: %p",thd->stmt_arena));
if (db_name && lower_case_table_names)
{
diff --git a/sql/sql_binlog.cc b/sql/sql_binlog.cc
index 5f554a3cd92..f58bcf2e8fe 100644
--- a/sql/sql_binlog.cc
+++ b/sql/sql_binlog.cc
@@ -192,8 +192,8 @@ void mysql_client_binlog_statement(THD* thd)
since it will read from unassigned memory.
*/
DBUG_PRINT("info",
- ("bytes_decoded: %d strptr: 0x%lx endptr: 0x%lx ('%c':%d)",
- bytes_decoded, (long) strptr, (long) endptr, *endptr,
+ ("bytes_decoded: %d strptr: %p endptr: %p ('%c':%d)",
+ bytes_decoded, strptr, endptr, *endptr,
*endptr));
#endif
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
index b43b6af96e1..d68bf72aedc 100644
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -356,27 +356,27 @@ const uchar *query_state_map;
#endif
#if defined(EXTRA_DEBUG) && !defined(DBUG_OFF)
-#define RW_WLOCK(M) {DBUG_PRINT("lock", ("rwlock wlock 0x%lx",(ulong)(M))); \
+#define RW_WLOCK(M) {DBUG_PRINT("lock", ("rwlock wlock %p",(M))); \
if (!mysql_rwlock_wrlock(M)) DBUG_PRINT("lock", ("rwlock wlock ok")); \
else DBUG_PRINT("lock", ("rwlock wlock FAILED %d", errno)); }
-#define RW_RLOCK(M) {DBUG_PRINT("lock", ("rwlock rlock 0x%lx", (ulong)(M))); \
+#define RW_RLOCK(M) {DBUG_PRINT("lock", ("rwlock rlock %p",(M))); \
if (!mysql_rwlock_rdlock(M)) DBUG_PRINT("lock", ("rwlock rlock ok")); \
else DBUG_PRINT("lock", ("rwlock wlock FAILED %d", errno)); }
-#define RW_UNLOCK(M) {DBUG_PRINT("lock", ("rwlock unlock 0x%lx",(ulong)(M))); \
+#define RW_UNLOCK(M) {DBUG_PRINT("lock", ("rwlock unlock %p",(M))); \
if (!mysql_rwlock_unlock(M)) DBUG_PRINT("lock", ("rwlock unlock ok")); \
else DBUG_PRINT("lock", ("rwlock unlock FAILED %d", errno)); }
-#define BLOCK_LOCK_WR(B) {DBUG_PRINT("lock", ("%d LOCK_WR 0x%lx",\
- __LINE__,(ulong)(B))); \
+#define BLOCK_LOCK_WR(B) {DBUG_PRINT("lock", ("%d LOCK_WR %p",\
+ __LINE__,(B))); \
B->query()->lock_writing();}
-#define BLOCK_LOCK_RD(B) {DBUG_PRINT("lock", ("%d LOCK_RD 0x%lx",\
- __LINE__,(ulong)(B))); \
+#define BLOCK_LOCK_RD(B) {DBUG_PRINT("lock", ("%d LOCK_RD %p",\
+ __LINE__,(B))); \
B->query()->lock_reading();}
#define BLOCK_UNLOCK_WR(B) { \
- DBUG_PRINT("lock", ("%d UNLOCK_WR 0x%lx",\
- __LINE__,(ulong)(B)));B->query()->unlock_writing();}
+ DBUG_PRINT("lock", ("%d UNLOCK_WR %p",\
+ __LINE__,(B)));B->query()->unlock_writing();}
#define BLOCK_UNLOCK_RD(B) { \
- DBUG_PRINT("lock", ("%d UNLOCK_RD 0x%lx",\
- __LINE__,(ulong)(B)));B->query()->unlock_reading();}
+ DBUG_PRINT("lock", ("%d UNLOCK_RD %p",\
+ __LINE__,(B)));B->query()->unlock_reading();}
#define DUMP(C) DBUG_EXECUTE("qcache", {\
(C)->cache_dump(); (C)->queries_dump();(C)->tables_dump();})
#else
@@ -647,7 +647,7 @@ bool Query_cache::try_lock(THD *thd, Cache_try_lock_mode mode)
else if (mode == TIMEOUT)
{
struct timespec waittime;
- set_timespec_nsec(waittime,(ulong)(50000000L)); /* Wait for 50 msec */
+ set_timespec_nsec(waittime,50000000UL); /* Wait for 50 msec */
int res= mysql_cond_timedwait(&COND_cache_status_changed,
&structure_guard_mutex, &waittime);
if (res == ETIMEDOUT)
@@ -821,7 +821,7 @@ inline Query_cache_block * Query_cache_block_table::block()
void Query_cache_block::init(ulong block_length)
{
DBUG_ENTER("Query_cache_block::init");
- DBUG_PRINT("qcache", ("init block: 0x%lx length: %lu", (ulong) this,
+ DBUG_PRINT("qcache", ("init block: %p length: %lu", this,
block_length));
length = block_length;
used = 0;
@@ -833,8 +833,8 @@ void Query_cache_block::init(ulong block_length)
void Query_cache_block::destroy()
{
DBUG_ENTER("Query_cache_block::destroy");
- DBUG_PRINT("qcache", ("destroy block 0x%lx, type %d",
- (ulong) this, type));
+ DBUG_PRINT("qcache", ("destroy block %p, type %d",
+ this, type));
type = INCOMPLETE;
DBUG_VOID_RETURN;
}
@@ -936,7 +936,7 @@ bool Query_cache_query::try_lock_writing()
DBUG_PRINT("info", ("can't lock rwlock"));
DBUG_RETURN(0);
}
- DBUG_PRINT("info", ("rwlock 0x%lx locked", (ulong) &lock));
+ DBUG_PRINT("info", ("rwlock %p locked", &lock));
DBUG_RETURN(1);
}
@@ -965,9 +965,9 @@ void Query_cache_query::init_n_lock()
res=0; wri = 0; len = 0; ready= 0;
mysql_rwlock_init(key_rwlock_query_cache_query_lock, &lock);
lock_writing();
- DBUG_PRINT("qcache", ("inited & locked query for block 0x%lx",
- (long) (((uchar*) this) -
- ALIGN_SIZE(sizeof(Query_cache_block)))));
+ DBUG_PRINT("qcache", ("inited & locked query for block %p",
+ (uchar*) this -
+ ALIGN_SIZE(sizeof(Query_cache_block))));
DBUG_VOID_RETURN;
}
@@ -975,9 +975,9 @@ void Query_cache_query::init_n_lock()
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",
- (long) (((uchar*) this) -
- ALIGN_SIZE(sizeof(Query_cache_block)))));
+ DBUG_PRINT("qcache", ("destroyed & unlocked query for block %p",
+ (uchar*) this -
+ ALIGN_SIZE(sizeof(Query_cache_block))));
/*
The following call is not needed on system where one can destroy an
active semaphore
@@ -1110,7 +1110,7 @@ Query_cache::insert(THD *thd, Query_cache_tls *query_cache_tls,
{
DBUG_PRINT("warning", ("Can't append data"));
header->result(result);
- DBUG_PRINT("qcache", ("free query 0x%lx", (ulong) query_block));
+ DBUG_PRINT("qcache", ("free query %p", query_block));
// The following call will remove the lock on query_block
query_cache.free_query(query_block);
query_cache.refused++;
@@ -1446,7 +1446,7 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used)
flags.default_week_format= thd->variables.default_week_format;
DBUG_PRINT("qcache", ("\
long %d, 4.1: %d, eof: %d, bin_proto: %d, more results %d, pkt_nr: %d, \
-CS client: %u, CS result: %u, CS conn: %u, limit: %lu, TZ: 0x%lx, \
+CS client: %u, CS result: %u, CS conn: %u, limit: %llu, TZ: %p, \
sql mode: 0x%llx, sort len: %lu, conncat len: %lu, div_precision: %lu, \
def_week_frmt: %lu, in_trans: %d, autocommit: %d",
(int)flags.client_long_flag,
@@ -1458,8 +1458,8 @@ def_week_frmt: %lu, in_trans: %d, autocommit: %d",
flags.character_set_client_num,
flags.character_set_results_num,
flags.collation_connection_num,
- (ulong) flags.limit,
- (ulong) flags.time_zone,
+ (ulonglong)flags.limit,
+ flags.time_zone,
flags.sql_mode,
flags.max_sort_length,
flags.group_concat_max_len,
@@ -1522,7 +1522,7 @@ def_week_frmt: %lu, in_trans: %d, autocommit: %d",
/* Check if another thread is processing the same query? */
Query_cache_block *competitor = (Query_cache_block *)
my_hash_search(&queries, (uchar*) query, tot_length);
- DBUG_PRINT("qcache", ("competitor 0x%lx", (ulong) competitor));
+ DBUG_PRINT("qcache", ("competitor %p", competitor));
if (competitor == 0)
{
/* Query is not in cache and no one is working with it; Store it */
@@ -1532,8 +1532,8 @@ def_week_frmt: %lu, in_trans: %d, autocommit: %d",
Query_cache_block::QUERY, local_tables);
if (query_block != 0)
{
- DBUG_PRINT("qcache", ("query block 0x%lx allocated, %lu",
- (ulong) query_block, query_block->used));
+ DBUG_PRINT("qcache", ("query block %p allocated, %lu",
+ query_block, query_block->used));
Query_cache_query *header = query_block->query();
header->init_n_lock();
@@ -1944,7 +1944,7 @@ Query_cache::send_result_to_client(THD *thd, char *org_sql, uint query_length)
flags.lc_time_names= thd->variables.lc_time_names;
DBUG_PRINT("qcache", ("\
long %d, 4.1: %d, eof: %d, bin_proto: %d, more results %d, pkt_nr: %d, \
-CS client: %u, CS result: %u, CS conn: %u, limit: %lu, TZ: 0x%lx, \
+CS client: %u, CS result: %u, CS conn: %u, limit: %llu, TZ: %p, \
sql mode: 0x%llx, sort len: %lu, conncat len: %lu, div_precision: %lu, \
def_week_frmt: %lu, in_trans: %d, autocommit: %d",
(int)flags.client_long_flag,
@@ -1956,8 +1956,8 @@ def_week_frmt: %lu, in_trans: %d, autocommit: %d",
flags.character_set_client_num,
flags.character_set_results_num,
flags.collation_connection_num,
- (ulong) flags.limit,
- (ulong) flags.time_zone,
+ (ulonglong) flags.limit,
+ flags.time_zone,
flags.sql_mode,
flags.max_sort_length,
flags.group_concat_max_len,
@@ -1984,7 +1984,7 @@ lookup:
DBUG_PRINT("qcache", ("No query in query hash or no results"));
goto err_unlock;
}
- DBUG_PRINT("qcache", ("Query in query hash 0x%lx", (ulong)query_block));
+ DBUG_PRINT("qcache", ("Query in query hash %p",query_block));
#ifdef WITH_WSREP
if (once_more && WSREP_CLIENT(thd) && wsrep_must_sync_wait(thd))
@@ -2015,7 +2015,7 @@ lookup:
BLOCK_UNLOCK_RD(query_block);
goto err_unlock;
}
- DBUG_PRINT("qcache", ("Query have result 0x%lx", (ulong) query));
+ DBUG_PRINT("qcache", ("Query have result %p", query));
if (thd->in_multi_stmt_transaction_mode() &&
(query->tables_type() & HA_CACHE_TBL_TRANSACT))
@@ -2112,9 +2112,9 @@ lookup:
if (engine_data != table->engine_data())
{
DBUG_PRINT("qcache",
- ("Handler require invalidation queries of %.*s %lu-%lu",
+ ("Handler require invalidation queries of %.*s %llu-%llu",
qcache_se_key_len, qcache_se_key_name,
- (ulong) engine_data, (ulong) table->engine_data()));
+ engine_data, table->engine_data()));
invalidate_table_internal(thd,
(uchar *) table->db(),
table->key_length());
@@ -2152,9 +2152,9 @@ lookup:
THD_STAGE_INFO(thd, stage_sending_cached_result_to_client);
do
{
- DBUG_PRINT("qcache", ("Results (len: %lu used: %lu headers: %lu)",
+ DBUG_PRINT("qcache", ("Results (len: %lu used: %lu headers: %u)",
result_block->length, result_block->used,
- (ulong) (result_block->headers_len()+
+ (uint) (result_block->headers_len()+
ALIGN_SIZE(sizeof(Query_cache_result)))));
Query_cache_result *result = result_block->result();
@@ -2192,7 +2192,7 @@ lookup:
thd->get_stmt_da()->disable_status();
BLOCK_UNLOCK_RD(query_block);
- MYSQL_QUERY_CACHE_HIT(thd->query(), (ulong) thd->limit_found_rows);
+ MYSQL_QUERY_CACHE_HIT(thd->query(), thd->limit_found_rows);
DBUG_RETURN(1); // Result sent to client
err_unlock:
@@ -2899,8 +2899,8 @@ my_bool Query_cache::free_old_query()
void Query_cache::free_query_internal(Query_cache_block *query_block)
{
DBUG_ENTER("Query_cache::free_query_internal");
- DBUG_PRINT("qcache", ("free query 0x%lx %lu bytes result",
- (ulong) query_block,
+ DBUG_PRINT("qcache", ("free query %p %lu bytes result",
+ query_block,
query_block->query()->length() ));
queries_in_cache--;
@@ -2969,8 +2969,8 @@ void Query_cache::free_query_internal(Query_cache_block *query_block)
void Query_cache::free_query(Query_cache_block *query_block)
{
DBUG_ENTER("Query_cache::free_query");
- DBUG_PRINT("qcache", ("free query 0x%lx %lu bytes result",
- (ulong) query_block,
+ DBUG_PRINT("qcache", ("free query %p %lu bytes result",
+ query_block,
query_block->query()->length() ));
my_hash_delete(&queries,(uchar *) query_block);
@@ -3017,8 +3017,8 @@ Query_cache::append_result_data(Query_cache_block **current_block,
Query_cache_block *query_block)
{
DBUG_ENTER("Query_cache::append_result_data");
- DBUG_PRINT("qcache", ("append %lu bytes to 0x%lx query",
- data_len, (long) query_block));
+ DBUG_PRINT("qcache", ("append %lu bytes to %p query",
+ data_len, query_block));
if (query_block->query()->add(data_len) > query_cache_limit)
{
@@ -3035,8 +3035,8 @@ Query_cache::append_result_data(Query_cache_block **current_block,
}
Query_cache_block *last_block = (*current_block)->prev;
- DBUG_PRINT("qcache", ("lastblock 0x%lx len %lu used %lu",
- (ulong) last_block, last_block->length,
+ DBUG_PRINT("qcache", ("lastblock %p len %lu used %lu",
+ last_block, last_block->length,
last_block->used));
my_bool success = 1;
ulong last_block_free_space= last_block->length - last_block->used;
@@ -3081,8 +3081,8 @@ Query_cache::append_result_data(Query_cache_block **current_block,
if (success && last_block_free_space > 0)
{
ulong to_copy = MY_MIN(data_len,last_block_free_space);
- DBUG_PRINT("qcache", ("use free space %lub at block 0x%lx to copy %lub",
- last_block_free_space, (ulong)last_block, to_copy));
+ DBUG_PRINT("qcache", ("use free space %lub at block %p to copy %lub",
+ last_block_free_space,last_block, to_copy));
memcpy((uchar*) last_block + last_block->used, data, to_copy);
last_block->used+=to_copy;
}
@@ -3123,8 +3123,8 @@ my_bool Query_cache::write_result_data(Query_cache_block **result_block,
{
block->type = type;
ulong length = block->used - headers_len;
- DBUG_PRINT("qcache", ("write %lu byte in block 0x%lx",length,
- (ulong)block));
+ DBUG_PRINT("qcache", ("write %lu byte in block %p",length,
+ block));
memcpy((uchar*) block+headers_len, rest, length);
rest += length;
block = block->next;
@@ -3387,12 +3387,12 @@ Query_cache::register_tables_from_list(THD *thd, TABLE_LIST *tables_used,
else
{
DBUG_PRINT("qcache",
- ("table: %s db: %s openinfo: 0x%lx keylen: %lu key: 0x%lx",
+ ("table: %s db: %s openinfo: %p keylen: %zu key: %p",
tables_used->table->s->table_name.str,
tables_used->table->s->table_cache_key.str,
- (ulong) tables_used->table,
- (ulong) tables_used->table->s->table_cache_key.length,
- (ulong) tables_used->table->s->table_cache_key.str));
+ tables_used->table,
+ tables_used->table->s->table_cache_key.length,
+ tables_used->table->s->table_cache_key.str));
if (!insert_table(thd, tables_used->table->s->table_cache_key.length,
tables_used->table->s->table_cache_key.str,
@@ -3429,8 +3429,8 @@ my_bool Query_cache::register_all_tables(THD *thd,
TABLE_COUNTER_TYPE tables_arg)
{
TABLE_COUNTER_TYPE n;
- DBUG_PRINT("qcache", ("register tables block 0x%lx, n %d, header %x",
- (ulong) block, (int) tables_arg,
+ DBUG_PRINT("qcache", ("register tables block %p, n %d, header %x",
+ block, (int) tables_arg,
(int) ALIGN_SIZE(sizeof(Query_cache_block))));
Query_cache_block_table *block_table = block->table(0);
@@ -3469,8 +3469,8 @@ Query_cache::insert_table(THD *thd, uint key_len, const char *key,
my_bool hash)
{
DBUG_ENTER("Query_cache::insert_table");
- DBUG_PRINT("qcache", ("insert table node 0x%lx, len %d",
- (ulong)node, key_len));
+ DBUG_PRINT("qcache", ("insert table node %p, len %d",
+ node, key_len));
Query_cache_block *table_block=
(hash ?
@@ -3481,11 +3481,11 @@ Query_cache::insert_table(THD *thd, uint key_len, const char *key,
table_block->table()->engine_data() != engine_data)
{
DBUG_PRINT("qcache",
- ("Handler require invalidation queries of %s.%s %lu-%lu",
+ ("Handler require invalidation queries of %s.%s %llu-%llu",
table_block->table()->db(),
table_block->table()->table(),
- (ulong) engine_data,
- (ulong) table_block->table()->engine_data()));
+ engine_data,
+ table_block->table()->engine_data()));
/*
as far as we delete all queries with this table, table block will be
deleted, too
@@ -3500,8 +3500,8 @@ Query_cache::insert_table(THD *thd, uint key_len, const char *key,
if (table_block == 0)
{
- DBUG_PRINT("qcache", ("new table block from 0x%lx (%u)",
- (ulong) key, (int) key_len));
+ DBUG_PRINT("qcache", ("new table block from %p (%u)",
+ key, (int) key_len));
table_block= write_block_data(key_len, (uchar*) key,
ALIGN_SIZE(sizeof(Query_cache_table)),
Query_cache_block::TABLE, 1);
@@ -3710,7 +3710,7 @@ Query_cache::get_free_block(ulong len, my_bool not_less, ulong min)
if (block != 0)
exclude_from_free_memory_list(block);
- DBUG_PRINT("qcache",("getting block 0x%lx", (ulong) block));
+ DBUG_PRINT("qcache",("getting block %p", block));
DBUG_RETURN(block);
}
@@ -3721,9 +3721,9 @@ void Query_cache::free_memory_block(Query_cache_block *block)
block->used=0;
block->type= Query_cache_block::FREE; // mark block as free in any case
DBUG_PRINT("qcache",
- ("first_block 0x%lx, block 0x%lx, pnext 0x%lx pprev 0x%lx",
- (ulong) first_block, (ulong) block, (ulong) block->pnext,
- (ulong) block->pprev));
+ ("first_block %p, block %p, pnext %p pprev %p",
+ first_block, block, block->pnext,
+ block->pprev));
if (block->pnext != first_block && block->pnext->is_free())
block = join_free_blocks(block, block->pnext);
@@ -3755,8 +3755,8 @@ void Query_cache::split_block(Query_cache_block *block, ulong len)
else
free_memory_block(new_block);
- DBUG_PRINT("qcache", ("split 0x%lx (%lu) new 0x%lx",
- (ulong) block, len, (ulong) new_block));
+ DBUG_PRINT("qcache", ("split %p (%lu) new %p",
+ block, len, new_block));
DBUG_VOID_RETURN;
}
@@ -3768,9 +3768,9 @@ Query_cache::join_free_blocks(Query_cache_block *first_block_arg,
Query_cache_block *second_block;
DBUG_ENTER("Query_cache::join_free_blocks");
DBUG_PRINT("qcache",
- ("join first 0x%lx, pnext 0x%lx, in list 0x%lx",
- (ulong) first_block_arg, (ulong) first_block_arg->pnext,
- (ulong) block_in_list));
+ ("join first %p, pnext %p, in list %p",
+ first_block_arg, first_block_arg->pnext,
+ block_in_list));
exclude_from_free_memory_list(block_in_list);
second_block = first_block_arg->pnext;
@@ -3792,7 +3792,7 @@ my_bool Query_cache::append_next_free_block(Query_cache_block *block,
{
Query_cache_block *next_block = block->pnext;
DBUG_ENTER("Query_cache::append_next_free_block");
- DBUG_PRINT("enter", ("block 0x%lx, add_size %lu", (ulong) block,
+ DBUG_PRINT("enter", ("block %p, add_size %lu", block,
add_size));
if (next_block != first_block && next_block->is_free())
@@ -3824,8 +3824,8 @@ void Query_cache::exclude_from_free_memory_list(Query_cache_block *free_block)
bin->number--;
free_memory-=free_block->length;
free_memory_blocks--;
- DBUG_PRINT("qcache",("exclude block 0x%lx, bin 0x%lx", (ulong) free_block,
- (ulong) bin));
+ DBUG_PRINT("qcache",("exclude block %p, bin %p", free_block,
+ bin));
DBUG_VOID_RETURN;
}
@@ -3842,8 +3842,8 @@ void Query_cache::insert_into_free_memory_list(Query_cache_block *free_block)
free_block->data());
*bin_ptr = bins+idx;
(*bin_ptr)->number++;
- DBUG_PRINT("qcache",("insert block 0x%lx, bin[%d] 0x%lx",
- (ulong) free_block, idx, (ulong) *bin_ptr));
+ DBUG_PRINT("qcache",("insert block %p, bin[%d] %p",
+ free_block, idx, *bin_ptr));
DBUG_VOID_RETURN;
}
@@ -3940,7 +3940,7 @@ Query_cache::double_linked_list_simple_include(Query_cache_block *point,
list_pointer)
{
DBUG_ENTER("Query_cache::double_linked_list_simple_include");
- DBUG_PRINT("qcache", ("including block 0x%lx", (ulong) point));
+ DBUG_PRINT("qcache", ("including block %p", point));
if (*list_pointer == 0)
*list_pointer=point->next=point->prev=point;
else
@@ -3959,8 +3959,8 @@ Query_cache::double_linked_list_exclude(Query_cache_block *point,
Query_cache_block **list_pointer)
{
DBUG_ENTER("Query_cache::double_linked_list_exclude");
- DBUG_PRINT("qcache", ("excluding block 0x%lx, list 0x%lx",
- (ulong) point, (ulong) list_pointer));
+ DBUG_PRINT("qcache", ("excluding block %p, list %p",
+ point, list_pointer));
if (point->next == point)
*list_pointer = 0; // empty list
else
@@ -4255,7 +4255,7 @@ my_bool Query_cache::move_by_type(uchar **border,
switch (block->type) {
case Query_cache_block::FREE:
{
- DBUG_PRINT("qcache", ("block 0x%lx FREE", (ulong) block));
+ DBUG_PRINT("qcache", ("block %p FREE", block));
if (*border == 0)
{
*border = (uchar *) block;
@@ -4274,7 +4274,7 @@ my_bool Query_cache::move_by_type(uchar **border,
case Query_cache_block::TABLE:
{
HASH_SEARCH_STATE record_idx;
- DBUG_PRINT("qcache", ("block 0x%lx TABLE", (ulong) block));
+ DBUG_PRINT("qcache", ("block %p TABLE", block));
if (*border == 0)
break;
ulong len = block->length, used = block->used;
@@ -4310,9 +4310,9 @@ my_bool Query_cache::move_by_type(uchar **border,
nlist_root->prev = tprev;
tprev->next = nlist_root;
DBUG_PRINT("qcache",
- ("list_root: 0x%lx tnext 0x%lx tprev 0x%lx tprev->next 0x%lx tnext->prev 0x%lx",
- (ulong) list_root, (ulong) tnext, (ulong) tprev,
- (ulong)tprev->next, (ulong)tnext->prev));
+ ("list_root: %p tnext %p tprev %p tprev->next %p tnext->prev %p",
+ list_root, tnext, tprev,
+ tprev->next,tnext->prev));
/*
Go through all queries that uses this table and change them to
point to the new table object
@@ -4327,14 +4327,14 @@ my_bool Query_cache::move_by_type(uchar **border,
/* Fix hash to point at moved block */
my_hash_replace(&tables, &record_idx, (uchar*) new_block);
- DBUG_PRINT("qcache", ("moved %lu bytes to 0x%lx, new gap at 0x%lx",
- len, (ulong) new_block, (ulong) *border));
+ DBUG_PRINT("qcache", ("moved %lu bytes to %p, new gap at %p",
+ len, new_block, *border));
break;
}
case Query_cache_block::QUERY:
{
HASH_SEARCH_STATE record_idx;
- DBUG_PRINT("qcache", ("block 0x%lx QUERY", (ulong) block));
+ DBUG_PRINT("qcache", ("block %p QUERY", block));
if (*border == 0)
break;
BLOCK_LOCK_WR(block);
@@ -4420,8 +4420,8 @@ my_bool Query_cache::move_by_type(uchar **border,
}
/* Fix hash to point at moved block */
my_hash_replace(&queries, &record_idx, (uchar*) new_block);
- DBUG_PRINT("qcache", ("moved %lu bytes to 0x%lx, new gap at 0x%lx",
- len, (ulong) new_block, (ulong) *border));
+ DBUG_PRINT("qcache", ("moved %lu bytes to %p, new gap at %p",
+ len, new_block, *border));
break;
}
case Query_cache_block::RES_INCOMPLETE:
@@ -4429,7 +4429,7 @@ my_bool Query_cache::move_by_type(uchar **border,
case Query_cache_block::RES_CONT:
case Query_cache_block::RESULT:
{
- DBUG_PRINT("qcache", ("block 0x%lx RES* (%d)", (ulong) block,
+ DBUG_PRINT("qcache", ("block %p RES* (%d)", block,
(int) block->type));
if (*border == 0)
break;
@@ -4469,13 +4469,13 @@ my_bool Query_cache::move_by_type(uchar **border,
new_block->length -= free_space;
}
BLOCK_UNLOCK_WR(query_block);
- DBUG_PRINT("qcache", ("moved %lu bytes to 0x%lx, new gap at 0x%lx",
- len, (ulong) new_block, (ulong) *border));
+ DBUG_PRINT("qcache", ("moved %lu bytes to %p, new gap at %p",
+ len, new_block, *border));
break;
}
default:
- DBUG_PRINT("error", ("unexpected block type %d, block 0x%lx",
- (int)block->type, (ulong) block));
+ DBUG_PRINT("error", ("unexpected block type %d, block %p",
+ (int)block->type, block));
ok = 0;
}
DBUG_RETURN(ok);
@@ -4676,16 +4676,16 @@ void Query_cache::bins_dump()
DBUG_PRINT("qcache", ("-------------------------"));
for (i=0; i < mem_bin_num; i++)
{
- DBUG_PRINT("qcache", ("%10lu %3d 0x%lx", bins[i].size, bins[i].number,
- (ulong)&(bins[i])));
+ DBUG_PRINT("qcache", ("%10lu %3d %p", bins[i].size, bins[i].number,
+ &(bins[i])));
if (bins[i].free_blocks)
{
Query_cache_block *block = bins[i].free_blocks;
do{
- DBUG_PRINT("qcache", ("\\-- %lu 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx",
- block->length, (ulong)block,
- (ulong)block->next, (ulong)block->prev,
- (ulong)block->pnext, (ulong)block->pprev));
+ DBUG_PRINT("qcache", ("\\-- %lu %p %p %p %p %p",
+ block->length,block,
+ block->next,block->prev,
+ block->pnext,block->pprev));
block = block->next;
} while ( block != bins[i].free_blocks );
}
@@ -4709,11 +4709,11 @@ void Query_cache::cache_dump()
do
{
DBUG_PRINT("qcache",
- ("%10lu %10lu %1d %2d 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx",
+ ("%10lu %10lu %1d %2d %p %p %p %p %p",
i->length, i->used, (int)i->type,
- i->n_tables, (ulong)i,
- (ulong)i->next, (ulong)i->prev, (ulong)i->pnext,
- (ulong)i->pprev));
+ i->n_tables,i,
+ i->next,i->prev,i->pnext,
+ i->pprev));
i = i->pnext;
} while ( i != first_block );
DBUG_PRINT("qcache", ("-------------------------------------"));
@@ -4743,15 +4743,15 @@ void Query_cache::queries_dump()
Query_cache_query_flags flags;
memcpy(&flags, str+len, QUERY_CACHE_FLAGS_SIZE);
str[len]= 0; // make zero ending DB name
- DBUG_PRINT("qcache", ("F: %u C: %u L: %lu T: '%s' (%lu) '%s' '%s'",
+ DBUG_PRINT("qcache", ("F: %u C: %u L: %llu T: '%s' (%zu) '%s' '%s'",
flags.client_long_flag,
flags.character_set_client_num,
- (ulong)flags.limit,
+ flags.limit,
flags.time_zone->get_name()->ptr(),
- (ulong) len, str, strend(str)+1));
- DBUG_PRINT("qcache", ("-b- 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx", (ulong) block,
- (ulong) block->next, (ulong) block->prev,
- (ulong)block->pnext, (ulong)block->pprev));
+ len, str, strend(str)+1));
+ DBUG_PRINT("qcache", ("-b- %p %p %p %p %p", block,
+ block->next, block->prev,
+ block->pnext,block->pprev));
memcpy(str + len, &flags, QUERY_CACHE_FLAGS_SIZE); // restore flags
for (TABLE_COUNTER_TYPE t= 0; t < block->n_tables; t++)
{
@@ -4765,14 +4765,14 @@ void Query_cache::queries_dump()
Query_cache_block *result_beg = result_block;
do
{
- DBUG_PRINT("qcache", ("-r- %u %lu/%lu 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx",
+ DBUG_PRINT("qcache", ("-r- %u %lu/%lu %p %p %p %p %p",
(uint) result_block->type,
result_block->length, result_block->used,
- (ulong) result_block,
- (ulong) result_block->next,
- (ulong) result_block->prev,
- (ulong) result_block->pnext,
- (ulong) result_block->pprev));
+ result_block,
+ result_block->next,
+ result_block->prev,
+ result_block->pnext,
+ result_block->pprev));
result_block = result_block->next;
} while ( result_block != result_beg );
}
@@ -4851,14 +4851,14 @@ my_bool Query_cache::check_integrity(bool locked)
if (!block)
break;
- DBUG_PRINT("qcache", ("block 0x%lx, type %u...",
- (ulong) block, (uint) block->type));
+ DBUG_PRINT("qcache", ("block %p, type %u...",
+ block, (uint) block->type));
// Check allignment
- if ((((long)block) % (long) ALIGN_SIZE(1)) !=
- (((long)first_block) % (long)ALIGN_SIZE(1)))
+ if ((((size_t)block) % ALIGN_SIZE(1)) !=
+ (((size_t)first_block) % ALIGN_SIZE(1)))
{
DBUG_PRINT("error",
- ("block 0x%lx do not aligned by %d", (ulong) block,
+ ("block %p do not aligned by %d", block,
(int) ALIGN_SIZE(1)));
result = 1;
}
@@ -4869,10 +4869,10 @@ my_bool Query_cache::check_integrity(bool locked)
((uchar*)first_block) + query_cache_size)
{
DBUG_PRINT("error",
- ("block 0x%lx, type %u, ended at 0x%lx, but cache ended at 0x%lx",
- (ulong) block, (uint) block->type,
- (ulong) (((uchar*)block) + block->length),
- (ulong) (((uchar*)first_block) + query_cache_size)));
+ ("block %p, type %u, ended at %p, but cache ended at %p",
+ block, (uint) block->type,
+ (((uchar*)block) + block->length),
+ (((uchar*)first_block) + query_cache_size)));
result = 1;
}
}
@@ -4880,10 +4880,10 @@ my_bool Query_cache::check_integrity(bool locked)
if (((uchar*)block) + block->length != ((uchar*)block->pnext))
{
DBUG_PRINT("error",
- ("block 0x%lx, type %u, ended at 0x%lx, but next block beginning at 0x%lx",
- (ulong) block, (uint) block->type,
- (ulong) (((uchar*)block) + block->length),
- (ulong) ((uchar*)block->pnext)));
+ ("block %p, type %u, ended at %p, but next block beginning at %p",
+ block, (uint) block->type,
+ (((uchar*)block) + block->length),
+ ((uchar*)block->pnext)));
}
if (block->type == Query_cache_block::FREE)
free+= block->length;
@@ -4899,11 +4899,11 @@ my_bool Query_cache::check_integrity(bool locked)
((uchar*)bin) >= ((uchar*)first_block))
{
DBUG_PRINT("error",
- ("free block 0x%lx have bin pointer 0x%lx beyaond of bins array bounds [0x%lx,0x%lx]",
- (ulong) block,
- (ulong) bin,
- (ulong) bins,
- (ulong) first_block));
+ ("free block %p have bin pointer %p beyaond of bins array bounds [%p,%p]",
+ block,
+ bin,
+ bins,
+ first_block));
result = 1;
}
else
@@ -4950,11 +4950,11 @@ my_bool Query_cache::check_integrity(bool locked)
((uchar*)query_block) >= (((uchar*)first_block) + query_cache_size))
{
DBUG_PRINT("error",
- ("result block 0x%lx have query block pointer 0x%lx beyaond of block pool bounds [0x%lx,0x%lx]",
- (ulong) block,
- (ulong) query_block,
- (ulong) first_block,
- (ulong) (((uchar*)first_block) + query_cache_size)));
+ ("result block %p have query block pointer %p beyaond of block pool bounds [%p,%p]",
+ block,
+ query_block,
+ first_block,
+ (((uchar*)first_block) + query_cache_size)));
result = 1;
}
else
@@ -4970,8 +4970,8 @@ my_bool Query_cache::check_integrity(bool locked)
break;
}
default:
- DBUG_PRINT("error", ("block 0x%lx have incorrect type %u",
- (long) block, block->type));
+ DBUG_PRINT("error", ("block %p have incorrect type %u",
+ block, block->type));
result = 1;
}
@@ -4999,15 +4999,15 @@ my_bool Query_cache::check_integrity(bool locked)
{
do
{
- DBUG_PRINT("qcache", ("block 0x%lx, type %u...",
- (ulong) block, (uint) block->type));
+ DBUG_PRINT("qcache", ("block %p, type %u...",
+ block, (uint) block->type));
size_t length;
uchar *key = query_cache_query_get_key((uchar*) block, &length, 0);
uchar* val = my_hash_search(&queries, key, length);
if (((uchar*)block) != val)
{
- DBUG_PRINT("error", ("block 0x%lx found in queries hash like 0x%lx",
- (ulong) block, (ulong) val));
+ DBUG_PRINT("error", ("block %p found in queries hash like %p",
+ block, val));
}
if (in_blocks(block))
result = 1;
@@ -5017,8 +5017,8 @@ my_bool Query_cache::check_integrity(bool locked)
Query_cache_block * result_block = results;
do
{
- DBUG_PRINT("qcache", ("block 0x%lx, type %u...",
- (ulong) block, (uint) block->type));
+ DBUG_PRINT("qcache", ("block %p, type %u...",
+ block, (uint) block->type));
if (in_blocks(result_block))
result = 1;
@@ -5034,15 +5034,15 @@ my_bool Query_cache::check_integrity(bool locked)
{
do
{
- DBUG_PRINT("qcache", ("block 0x%lx, type %u...",
- (ulong) block, (uint) block->type));
+ DBUG_PRINT("qcache", ("block %p, type %u...",
+ block, (uint) block->type));
size_t length;
uchar *key = query_cache_table_get_key((uchar*) block, &length, 0);
uchar* val = my_hash_search(&tables, key, length);
if (((uchar*)block) != val)
{
- DBUG_PRINT("error", ("block 0x%lx found in tables hash like 0x%lx",
- (ulong) block, (ulong) val));
+ DBUG_PRINT("error", ("block %p found in tables hash like %p",
+ block, val));
}
if (in_blocks(block))
@@ -5059,8 +5059,8 @@ my_bool Query_cache::check_integrity(bool locked)
uint count = 0;
do
{
- DBUG_PRINT("qcache", ("block 0x%lx, type %u...",
- (ulong) block, (uint) block->type));
+ DBUG_PRINT("qcache", ("block %p, type %u...",
+ block, (uint) block->type));
if (in_blocks(block))
result = 1;
@@ -5092,13 +5092,13 @@ my_bool Query_cache::in_blocks(Query_cache_block * point)
if (block->pprev->pnext != block)
{
DBUG_PRINT("error",
- ("block 0x%lx in physical list is incorrect linked, prev block 0x%lx refered as next to 0x%lx (check from 0x%lx)",
- (ulong) block, (ulong) block->pprev,
- (ulong) block->pprev->pnext,
- (ulong) point));
+ ("block %p in physical list is incorrect linked, prev block %p refered as next to %p (check from %p)",
+ block, block->pprev,
+ block->pprev->pnext,
+ point));
//back trace
for (; block != point; block = block->pnext)
- DBUG_PRINT("error", ("back trace 0x%lx", (ulong) block));
+ DBUG_PRINT("error", ("back trace %p", block));
result = 1;
goto err1;
}
@@ -5107,8 +5107,8 @@ my_bool Query_cache::in_blocks(Query_cache_block * point)
if (block != first_block)
{
DBUG_PRINT("error",
- ("block 0x%lx (0x%lx<-->0x%lx) not owned by pysical list",
- (ulong) block, (ulong) block->pprev, (ulong )block->pnext));
+ ("block %p (%p<-->%p) not owned by pysical list",
+ block, block->pprev, block->pnext));
return 1;
}
@@ -5120,13 +5120,13 @@ err1:
if (block->pnext->pprev != block)
{
DBUG_PRINT("error",
- ("block 0x%lx in physicel list is incorrect linked, next block 0x%lx refered as prev to 0x%lx (check from 0x%lx)",
- (ulong) block, (ulong) block->pnext,
- (ulong) block->pnext->pprev,
- (ulong) point));
+ ("block %p in physicel list is incorrect linked, next block %p refered as prev to %p (check from %p)",
+ block, block->pnext,
+ block->pnext->pprev,
+ point));
//back trace
for (; block != point; block = block->pprev)
- DBUG_PRINT("error", ("back trace 0x%lx", (ulong) block));
+ DBUG_PRINT("error", ("back trace %p", block));
result = 1;
goto err2;
}
@@ -5149,13 +5149,13 @@ my_bool Query_cache::in_list(Query_cache_block * root,
if (block->prev->next != block)
{
DBUG_PRINT("error",
- ("block 0x%lx in list '%s' 0x%lx is incorrect linked, prev block 0x%lx refered as next to 0x%lx (check from 0x%lx)",
- (ulong) block, name, (ulong) root, (ulong) block->prev,
- (ulong) block->prev->next,
- (ulong) point));
+ ("block %p in list '%s' %p is incorrect linked, prev block %p refered as next to %p (check from %p)",
+ block, name, root, block->prev,
+ block->prev->next,
+ point));
//back trace
for (; block != point; block = block->next)
- DBUG_PRINT("error", ("back trace 0x%lx", (ulong) block));
+ DBUG_PRINT("error", ("back trace %p", block));
result = 1;
goto err1;
}
@@ -5164,10 +5164,10 @@ my_bool Query_cache::in_list(Query_cache_block * root,
if (block != root)
{
DBUG_PRINT("error",
- ("block 0x%lx (0x%lx<-->0x%lx) not owned by list '%s' 0x%lx",
- (ulong) block,
- (ulong) block->prev, (ulong) block->next,
- name, (ulong) root));
+ ("block %p (%p<-->%p) not owned by list '%s' %p",
+ block,
+ block->prev, block->next,
+ name, root));
return 1;
}
err1:
@@ -5178,13 +5178,13 @@ err1:
if (block->next->prev != block)
{
DBUG_PRINT("error",
- ("block 0x%lx in list '%s' 0x%lx is incorrect linked, next block 0x%lx refered as prev to 0x%lx (check from 0x%lx)",
- (ulong) block, name, (ulong) root, (ulong) block->next,
- (ulong) block->next->prev,
- (ulong) point));
+ ("block %p in list '%s' %p is incorrect linked, next block %p refered as prev to %p (check from %p)",
+ block, name, root, block->next,
+ block->next->prev,
+ point));
//back trace
for (; block != point; block = block->prev)
- DBUG_PRINT("error", ("back trace 0x%lx", (ulong) block));
+ DBUG_PRINT("error", ("back trace %p", block));
result = 1;
goto err2;
}
@@ -5197,13 +5197,13 @@ err2:
void dump_node(Query_cache_block_table * node,
const char * call, const char * descr)
{
- DBUG_PRINT("qcache", ("%s: %s: node: 0x%lx", call, descr, (ulong) node));
- DBUG_PRINT("qcache", ("%s: %s: node block: 0x%lx",
- call, descr, (ulong) node->block()));
- DBUG_PRINT("qcache", ("%s: %s: next: 0x%lx", call, descr,
- (ulong) node->next));
- DBUG_PRINT("qcache", ("%s: %s: prev: 0x%lx", call, descr,
- (ulong) node->prev));
+ DBUG_PRINT("qcache", ("%s: %s: node: %p", call, descr, node));
+ DBUG_PRINT("qcache", ("%s: %s: node block: %p",
+ call, descr, node->block()));
+ DBUG_PRINT("qcache", ("%s: %s: next: %p", call, descr,
+ node->next));
+ DBUG_PRINT("qcache", ("%s: %s: prev: %p", call, descr,
+ node->prev));
}
my_bool Query_cache::in_table_list(Query_cache_block_table * root,
@@ -5220,17 +5220,17 @@ my_bool Query_cache::in_table_list(Query_cache_block_table * root,
if (table->prev->next != table)
{
DBUG_PRINT("error",
- ("table 0x%lx(0x%lx) in list '%s' 0x%lx(0x%lx) is incorrect linked, prev table 0x%lx(0x%lx) refered as next to 0x%lx(0x%lx) (check from 0x%lx(0x%lx))",
- (ulong) table, (ulong) table->block(), name,
- (ulong) root, (ulong) root->block(),
- (ulong) table->prev, (ulong) table->prev->block(),
- (ulong) table->prev->next,
- (ulong) table->prev->next->block(),
- (ulong) point, (ulong) point->block()));
+ ("table %p(%p) in list '%s' %p(%p) is incorrect linked, prev table %p(%p) refered as next to %p(%p) (check from %p(%p))",
+ table, table->block(), name,
+ root, root->block(),
+ table->prev, table->prev->block(),
+ table->prev->next,
+ table->prev->next->block(),
+ point, point->block()));
//back trace
for (; table != point; table = table->next)
- DBUG_PRINT("error", ("back trace 0x%lx(0x%lx)",
- (ulong) table, (ulong) table->block()));
+ DBUG_PRINT("error", ("back trace %p(%p)",
+ table, table->block()));
result = 1;
goto err1;
}
@@ -5239,11 +5239,11 @@ my_bool Query_cache::in_table_list(Query_cache_block_table * root,
if (table != root)
{
DBUG_PRINT("error",
- ("table 0x%lx(0x%lx) (0x%lx(0x%lx)<-->0x%lx(0x%lx)) not owned by list '%s' 0x%lx(0x%lx)",
- (ulong) table, (ulong) table->block(),
- (ulong) table->prev, (ulong) table->prev->block(),
- (ulong) table->next, (ulong) table->next->block(),
- name, (ulong) root, (ulong) root->block()));
+ ("table %p(%p) (%p(%p)<-->%p(%p)) not owned by list '%s' %p(%p)",
+ table, table->block(),
+ table->prev, table->prev->block(),
+ table->next, table->next->block(),
+ name, root, root->block()));
return 1;
}
err1:
@@ -5255,17 +5255,17 @@ err1:
if (table->next->prev != table)
{
DBUG_PRINT("error",
- ("table 0x%lx(0x%lx) in list '%s' 0x%lx(0x%lx) is incorrect linked, next table 0x%lx(0x%lx) refered as prev to 0x%lx(0x%lx) (check from 0x%lx(0x%lx))",
- (ulong) table, (ulong) table->block(),
- name, (ulong) root, (ulong) root->block(),
- (ulong) table->next, (ulong) table->next->block(),
- (ulong) table->next->prev,
- (ulong) table->next->prev->block(),
- (ulong) point, (ulong) point->block()));
+ ("table %p(%p) in list '%s' %p(%p) is incorrect linked, next table %p(%p) refered as prev to %p(%p) (check from %p(%p))",
+ table, table->block(),
+ name, root, root->block(),
+ table->next, table->next->block(),
+ table->next->prev,
+ table->next->prev->block(),
+ point, point->block()));
//back trace
for (; table != point; table = table->prev)
- DBUG_PRINT("error", ("back trace 0x%lx(0x%lx)",
- (ulong) table, (ulong) table->block()));
+ DBUG_PRINT("error", ("back trace %p(%p)",
+ table, table->block()));
result = 1;
goto err2;
}
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 82b2faf6a02..4d2cd46fda1 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -551,7 +551,7 @@ char *thd_get_error_context_description(THD *thd, char *buffer,
const char *proc_info= thd->proc_info;
len= my_snprintf(header, sizeof(header),
- "MySQL thread id %lu, OS thread handle 0x%lx, query id %lu",
+ "MySQL thread id %lu, OS thread handle %lu, query id %lu",
thd->thread_id, (ulong) thd->real_id, (ulong) thd->query_id);
str.length(0);
str.append(header, len);
@@ -915,7 +915,7 @@ THD::THD(my_thread_id id, bool is_wsrep_applier)
by adding the address of the stack.
*/
tmp= (ulong) (my_rnd(&sql_rand) * 0xffffffff);
- my_rnd_init(&rand, tmp + (ulong) &rand, tmp + (ulong) ::global_query_id);
+ my_rnd_init(&rand, tmp + (ulong)((size_t) &rand), tmp + (ulong) ::global_query_id);
substitute_null_with_insert_id = FALSE;
lock_info.mysql_thd= (void *)this;
@@ -3537,7 +3537,7 @@ void Query_arena::free_items()
{
next= free_list->next;
DBUG_ASSERT(free_list != next);
- DBUG_PRINT("info", ("free item: 0x%lx", (ulong) free_list));
+ DBUG_PRINT("info", ("free item: %p", free_list));
free_list->delete_self();
}
/* Postcondition: free_list is 0 */
@@ -3987,7 +3987,7 @@ int select_materialize_with_stats::send_data(List<Item> &items)
void TMP_TABLE_PARAM::init()
{
DBUG_ENTER("TMP_TABLE_PARAM::init");
- DBUG_PRINT("enter", ("this: 0x%lx", (ulong)this));
+ DBUG_PRINT("enter", ("this: %p", this));
field_count= sum_func_count= func_count= hidden_field_count= 0;
group_parts= group_length= group_null_parts= 0;
quick_group= 1;
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc
index bc5007e0880..691592c25ea 100644
--- a/sql/sql_derived.cc
+++ b/sql/sql_derived.cc
@@ -641,7 +641,7 @@ bool mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *derived)
SELECT_LEX_UNIT *unit= derived->get_unit();
DBUG_ENTER("mysql_derived_prepare");
bool res= FALSE;
- DBUG_PRINT("enter", ("unit 0x%lx", (ulong) unit));
+ DBUG_PRINT("enter", ("unit %p", unit));
if (!unit)
DBUG_RETURN(FALSE);
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 3a9bcf39555..a226ea17eb3 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -1470,8 +1470,8 @@ bool mysql_prepare_insert(THD *thd, TABLE_LIST *table_list,
bool res= 0;
table_map map= 0;
DBUG_ENTER("mysql_prepare_insert");
- DBUG_PRINT("enter", ("table_list: 0x%lx table: 0x%lx view: %d",
- (ulong)table_list, (ulong)table,
+ DBUG_PRINT("enter", ("table_list: %p table: %p view: %d",
+ table_list, table,
(int)insert_into_view));
/* INSERT should have a SELECT or VALUES clause */
DBUG_ASSERT (!select_insert || !values);
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index f9330bc4375..4d776671ee7 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -759,7 +759,7 @@ void lex_start(THD *thd)
void lex_end(LEX *lex)
{
DBUG_ENTER("lex_end");
- DBUG_PRINT("enter", ("lex: 0x%lx", (long) lex));
+ DBUG_PRINT("enter", ("lex: %p", lex));
lex_end_stage1(lex);
lex_end_stage2(lex);
@@ -2594,7 +2594,7 @@ bool st_select_lex::add_gorder_to_list(THD *thd, Item *item, bool asc)
bool st_select_lex::add_item_to_list(THD *thd, Item *item)
{
DBUG_ENTER("st_select_lex::add_item_to_list");
- DBUG_PRINT("info", ("Item: 0x%lx", (long) item));
+ DBUG_PRINT("info", ("Item: %p", item));
DBUG_RETURN(item_list.push_back(item, thd->mem_root));
}
@@ -4657,9 +4657,9 @@ bool LEX::set_arena_for_set_stmt(Query_arena *backup)
Query_arena_memroot(mem_root_for_set_stmt,
Query_arena::STMT_INITIALIZED)))
DBUG_RETURN(1);
- DBUG_PRINT("info", ("mem_root: 0x%lx arena: 0x%lx",
- (ulong) mem_root_for_set_stmt,
- (ulong) arena_for_set_stmt));
+ DBUG_PRINT("info", ("mem_root: %p arena: %p",
+ mem_root_for_set_stmt,
+ arena_for_set_stmt));
thd->set_n_backup_active_arena(arena_for_set_stmt, backup);
DBUG_RETURN(0);
}
@@ -4670,9 +4670,9 @@ void LEX::reset_arena_for_set_stmt(Query_arena *backup)
DBUG_ENTER("LEX::reset_arena_for_set_stmt");
DBUG_ASSERT(arena_for_set_stmt);
thd->restore_active_arena(arena_for_set_stmt, backup);
- DBUG_PRINT("info", ("mem_root: 0x%lx arena: 0x%lx",
- (ulong) arena_for_set_stmt->mem_root,
- (ulong) arena_for_set_stmt));
+ DBUG_PRINT("info", ("mem_root: %p arena: %p",
+ arena_for_set_stmt->mem_root,
+ arena_for_set_stmt));
DBUG_VOID_RETURN;
}
@@ -4682,9 +4682,9 @@ void LEX::free_arena_for_set_stmt()
DBUG_ENTER("LEX::free_arena_for_set_stmt");
if (!arena_for_set_stmt)
return;
- DBUG_PRINT("info", ("mem_root: 0x%lx arena: 0x%lx",
- (ulong) arena_for_set_stmt->mem_root,
- (ulong) arena_for_set_stmt));
+ DBUG_PRINT("info", ("mem_root: %p arena: %p",
+ arena_for_set_stmt->mem_root,
+ arena_for_set_stmt));
arena_for_set_stmt->free_items();
delete(arena_for_set_stmt);
free_root(mem_root_for_set_stmt, MYF(MY_KEEP_PREALLOC));
diff --git a/sql/sql_manager.cc b/sql/sql_manager.cc
index 8cf849b97d0..8c8aee0cb03 100644
--- a/sql/sql_manager.cc
+++ b/sql/sql_manager.cc
@@ -159,7 +159,7 @@ void stop_handle_manager()
if (manager_thread_in_use)
{
mysql_mutex_lock(&LOCK_manager);
- DBUG_PRINT("quit", ("initiate shutdown of handle manager thread: 0x%lx",
+ DBUG_PRINT("quit", ("initiate shutdown of handle manager thread: %lu",
(ulong)manager_thread));
mysql_cond_signal(&COND_manager);
mysql_mutex_unlock(&LOCK_manager);
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index f29614ba864..6e4da0fbbf2 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -4884,7 +4884,7 @@ that are reorganised.
{
if (!alt_part_info->use_default_partitions)
{
- DBUG_PRINT("info", ("part_info: 0x%lx", (long) tab_part_info));
+ DBUG_PRINT("info", ("part_info: %p", tab_part_info));
tab_part_info->use_default_partitions= FALSE;
}
tab_part_info->use_default_num_partitions= FALSE;
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index 97ef24f44ed..eb18a5ba36f 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -775,7 +775,7 @@ static st_plugin_dl *plugin_dl_add(const LEX_STRING *dl, int report)
if (global_system_variables.log_warnings > 2)
{
struct link_map *lm = (struct link_map*) plugin_dl.handle;
- sql_print_information("Loaded '%s' with offset 0x%lx", dl->str, lm->l_addr);
+ sql_print_information("Loaded '%s' with offset 0x%zx", dl->str, (size_t)lm->l_addr);
}
#endif
@@ -976,8 +976,8 @@ static plugin_ref intern_plugin_lock(LEX *lex, plugin_ref rc)
*plugin= pi;
#endif
pi->ref_count++;
- DBUG_PRINT("lock",("thd: 0x%lx plugin: \"%s\" LOCK ref_count: %d",
- (long) current_thd, pi->name.str, pi->ref_count));
+ DBUG_PRINT("lock",("thd: %p plugin: \"%s\" LOCK ref_count: %d",
+ current_thd, pi->name.str, pi->ref_count));
if (lex)
insert_dynamic(&lex->plugins, (uchar*)&plugin);
@@ -1338,8 +1338,8 @@ static void intern_plugin_unlock(LEX *lex, plugin_ref plugin)
DBUG_ASSERT(pi->ref_count);
pi->ref_count--;
- DBUG_PRINT("lock",("thd: 0x%lx plugin: \"%s\" UNLOCK ref_count: %d",
- (long) current_thd, pi->name.str, pi->ref_count));
+ DBUG_PRINT("lock",("thd: %p plugin: \"%s\" UNLOCK ref_count: %d",
+ current_thd, pi->name.str, pi->ref_count));
if (pi->state == PLUGIN_IS_DELETED && !pi->ref_count)
reap_needed= true;
@@ -3243,8 +3243,8 @@ static void plugin_vars_free_values(sys_var *vars)
{
/* Free the string from global_system_variables. */
char **valptr= (char**) piv->real_value_ptr(NULL, OPT_GLOBAL);
- DBUG_PRINT("plugin", ("freeing value for: '%s' addr: 0x%lx",
- var->name.str, (long) valptr));
+ DBUG_PRINT("plugin", ("freeing value for: '%s' addr: %p",
+ var->name.str, valptr));
my_free(*valptr);
*valptr= NULL;
}
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index c8ebbb08f15..6724346a490 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -3236,7 +3236,7 @@ void mysql_sql_stmt_execute(THD *thd)
DBUG_VOID_RETURN;
}
- DBUG_PRINT("info",("stmt: 0x%lx", (long) stmt));
+ DBUG_PRINT("info",("stmt: %p", stmt));
if (lex->prepared_stmt_params_fix_fields(thd))
DBUG_VOID_RETURN;
@@ -3763,8 +3763,8 @@ void Prepared_statement::setup_set_params()
Prepared_statement::~Prepared_statement()
{
DBUG_ENTER("Prepared_statement::~Prepared_statement");
- DBUG_PRINT("enter",("stmt: 0x%lx cursor: 0x%lx",
- (long) this, (long) cursor));
+ DBUG_PRINT("enter",("stmt: %p cursor: %p",
+ this, cursor));
delete cursor;
/*
We have to call free on the items even if cleanup is called as some items,
@@ -3791,7 +3791,7 @@ Query_arena::Type Prepared_statement::type() const
void Prepared_statement::cleanup_stmt()
{
DBUG_ENTER("Prepared_statement::cleanup_stmt");
- DBUG_PRINT("enter",("stmt: 0x%lx", (long) this));
+ DBUG_PRINT("enter",("stmt: %p", this));
thd->restore_set_statement_var();
cleanup_items(free_list);
thd->cleanup_after_query();
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 326e87f9d91..513c02b99e4 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -10274,8 +10274,8 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond)
tmp_cond= new (thd->mem_root) Item_func_trig_cond(thd, tmp_cond,
&first_inner_tab->
not_null_compl);
- DBUG_PRINT("info", ("Item_func_trig_cond 0x%lx",
- (ulong) tmp_cond));
+ DBUG_PRINT("info", ("Item_func_trig_cond %p",
+ tmp_cond));
if (tmp_cond)
tmp_cond->quick_fix_field();
/* Add the predicate to other pushed down predicates */
@@ -10283,8 +10283,8 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond)
*sel_cond_ref= !(*sel_cond_ref) ?
tmp_cond :
new (thd->mem_root) Item_cond_and(thd, *sel_cond_ref, tmp_cond);
- DBUG_PRINT("info", ("Item_cond_and 0x%lx",
- (ulong)(*sel_cond_ref)));
+ DBUG_PRINT("info", ("Item_cond_and %p",
+ (*sel_cond_ref)));
if (!(*sel_cond_ref))
DBUG_RETURN(1);
(*sel_cond_ref)->quick_fix_field();
@@ -20033,9 +20033,9 @@ end_update(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)),
Item *item= *group->item;
if (group->fast_field_copier_setup != group->field)
{
- DBUG_PRINT("info", ("new setup 0x%lx -> 0x%lx",
- (ulong)group->fast_field_copier_setup,
- (ulong)group->field));
+ DBUG_PRINT("info", ("new setup %p -> %p",
+ group->fast_field_copier_setup,
+ group->field));
group->fast_field_copier_setup= group->field;
group->fast_field_copier_func=
item->setup_fast_field_copier(group->field);
@@ -24667,8 +24667,8 @@ int JOIN::save_explain_data_intern(Explain_query *output,
JOIN *join= this; /* Legacy: this code used to be a non-member function */
int cur_error= 0;
DBUG_ENTER("JOIN::save_explain_data_intern");
- DBUG_PRINT("info", ("Select 0x%lx, type %s, message %s",
- (ulong)join->select_lex, join->select_lex->type,
+ DBUG_PRINT("info", ("Select %p, type %s, message %s",
+ join->select_lex, join->select_lex->type,
message ? message : "NULL"));
DBUG_ASSERT(have_query_plan == QEP_AVAILABLE);
/* fake_select_lex is created/printed by Explain_union */
diff --git a/sql/sql_servers.cc b/sql/sql_servers.cc
index 836b0563e23..ca721b9e366 100644
--- a/sql/sql_servers.cc
+++ b/sql/sql_servers.cc
@@ -350,8 +350,8 @@ get_server_from_table_to_cache(TABLE *table)
DBUG_PRINT("info", ("server->socket %s", server->socket));
if (my_hash_insert(&servers_cache, (uchar*) server))
{
- DBUG_PRINT("info", ("had a problem inserting server %s at %lx",
- server->server_name, (long unsigned int) server));
+ DBUG_PRINT("info", ("had a problem inserting server %s at %p",
+ server->server_name, server));
// error handling needed here
DBUG_RETURN(TRUE);
}
@@ -431,13 +431,13 @@ insert_server_record_into_cache(FOREIGN_SERVER *server)
We succeded in insertion of the server to the table, now insert
the server to the cache
*/
- DBUG_PRINT("info", ("inserting server %s at %lx, length %d",
- server->server_name, (long unsigned int) server,
+ DBUG_PRINT("info", ("inserting server %s at %p, length %d",
+ server->server_name, server,
server->server_name_length));
if (my_hash_insert(&servers_cache, (uchar*) server))
{
- DBUG_PRINT("info", ("had a problem inserting server %s at %lx",
- server->server_name, (long unsigned int) server));
+ DBUG_PRINT("info", ("had a problem inserting server %s at %p",
+ server->server_name, server));
// error handling needed here
error= 1;
}
@@ -804,8 +804,8 @@ int update_server_record_in_cache(FOREIGN_SERVER *existing,
*/
if (my_hash_insert(&servers_cache, (uchar*)altered))
{
- DBUG_PRINT("info", ("had a problem inserting server %s at %lx",
- altered->server_name, (long unsigned int) altered));
+ DBUG_PRINT("info", ("had a problem inserting server %s at %p",
+ altered->server_name,altered));
error= ER_OUT_OF_RESOURCES;
}
diff --git a/sql/sql_string.h b/sql/sql_string.h
index 9a9fff8522c..1310819d2e3 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -466,8 +466,8 @@ public:
}
bool append(const String &s);
bool append(const char *s);
- bool append(const LEX_STRING *ls) { return append(ls->str, ls->length); }
- bool append(const LEX_CSTRING *ls) { return append(ls->str, ls->length); }
+ bool append(const LEX_STRING *ls) { return append(ls->str, (uint32)ls->length); }
+ bool append(const LEX_CSTRING *ls) { return append(ls->str, (uint32)ls->length); }
bool append(const char *s, uint32 arg_length);
bool append(const char *s, uint32 arg_length, CHARSET_INFO *cs);
bool append_ulonglong(ulonglong val);
@@ -634,7 +634,7 @@ public:
}
bool append_for_single_quote(const char *st)
{
- return append_for_single_quote(st, strlen(st));
+ return append_for_single_quote(st, (uint)strlen(st));
}
/* Swap two string objects. Efficient way to exchange data without memcpy. */
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index afa27d790d4..2ea8779c1a9 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -2272,9 +2272,9 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables, bool if_exists,
size_t db_length= table->db_length;
handlerton *table_type= 0;
- DBUG_PRINT("table", ("table_l: '%s'.'%s' table: 0x%lx s: 0x%lx",
- table->db, table->table_name, (long) table->table,
- table->table ? (long) table->table->s : (long) -1));
+ DBUG_PRINT("table", ("table_l: '%s'.'%s' table: %p s: %p",
+ table->db, table->table_name, table->table,
+ table->table ? table->table->s : NULL));
/*
If we are in locked tables mode and are dropping a temporary table,
@@ -2517,8 +2517,8 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables, bool if_exists,
mysql_audit_drop_table(thd, table);
}
- DBUG_PRINT("table", ("table: 0x%lx s: 0x%lx", (long) table->table,
- table->table ? (long) table->table->s : (long) -1));
+ DBUG_PRINT("table", ("table: %p s: %p", table->table,
+ table->table ? table->table->s : NULL));
}
DEBUG_SYNC(thd, "rm_table_no_locks_before_binlog");
thd->thread_specific_used|= (trans_tmp_table_deleted ||
diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index 55550ddfb8a..d39dc739893 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -1151,7 +1151,7 @@ bool mysql_make_view(THD *thd, TABLE_SHARE *share, TABLE_LIST *table,
bool result, view_is_mergeable;
TABLE_LIST *UNINIT_VAR(view_main_select_tables);
DBUG_ENTER("mysql_make_view");
- DBUG_PRINT("info", ("table: 0x%lx (%s)", (ulong) table, table->table_name));
+ DBUG_PRINT("info", ("table: %p (%s)", table, table->table_name));
if (table->required_type == FRMTYPE_TABLE)
{
diff --git a/sql/strfunc.cc b/sql/strfunc.cc
index bf5fe9d6f00..4928e939e27 100644
--- a/sql/strfunc.cc
+++ b/sql/strfunc.cc
@@ -158,7 +158,7 @@ uint find_type2(const TYPELIB *typelib, const char *x, uint length,
int pos;
const char *j;
DBUG_ENTER("find_type2");
- DBUG_PRINT("enter",("x: '%.*s' lib: 0x%lx", length, x, (long) typelib));
+ DBUG_PRINT("enter",("x: '%.*s' lib: %p", length, x, typelib));
if (!typelib->count)
{
diff --git a/sql/table.cc b/sql/table.cc
index 5896b0a4c7a..7e75015deb9 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -3001,8 +3001,8 @@ enum open_frm_error open_table_from_share(THD *thd, TABLE_SHARE *share,
Field **field_ptr;
uint8 save_context_analysis_only= thd->lex->context_analysis_only;
DBUG_ENTER("open_table_from_share");
- DBUG_PRINT("enter",("name: '%s.%s' form: 0x%lx", share->db.str,
- share->table_name.str, (long) outparam));
+ DBUG_PRINT("enter",("name: '%s.%s' form: %p", share->db.str,
+ share->table_name.str, outparam));
thd->lex->context_analysis_only&= ~CONTEXT_ANALYSIS_ONLY_VIEW; // not a view
@@ -3406,7 +3406,7 @@ int closefrm(register TABLE *table)
{
int error=0;
DBUG_ENTER("closefrm");
- DBUG_PRINT("enter", ("table: 0x%lx", (long) table));
+ DBUG_PRINT("enter", ("table: %p", table));
if (table->db_stat)
error=table->file->ha_close();
diff --git a/sql/table_cache.cc b/sql/table_cache.cc
index 2feace30672..f7296ca72c8 100644
--- a/sql/table_cache.cc
+++ b/sql/table_cache.cc
@@ -913,8 +913,8 @@ retry:
}
end:
- DBUG_PRINT("exit", ("share: 0x%lx ref_count: %u",
- (ulong) share, share->tdc->ref_count));
+ DBUG_PRINT("exit", ("share: %p ref_count: %u",
+ share, share->tdc->ref_count));
if (flags & GTS_NOLOCK)
{
tdc_release_share(share);
@@ -945,8 +945,8 @@ void tdc_release_share(TABLE_SHARE *share)
mysql_mutex_lock(&share->tdc->LOCK_table_share);
DBUG_PRINT("enter",
- ("share: 0x%lx table: %s.%s ref_count: %u version: %lu",
- (ulong) share, share->db.str, share->table_name.str,
+ ("share: %p table: %s.%s ref_count: %u version: %lu",
+ share, share->db.str, share->table_name.str,
share->tdc->ref_count, share->tdc->version));
DBUG_ASSERT(share->tdc->ref_count);
diff --git a/sql/temporary_tables.cc b/sql/temporary_tables.cc
index 42ebb87cbe4..8077324d202 100644
--- a/sql/temporary_tables.cc
+++ b/sql/temporary_tables.cc
@@ -1127,8 +1127,8 @@ TABLE *THD::open_temporary_table(TMP_TABLE_SHARE *share,
thread_safe_increment32(&slave_open_temp_tables);
}
- DBUG_PRINT("tmptable", ("Opened table: '%s'.'%s' 0x%lx", table->s->db.str,
- table->s->table_name.str, (long) table));
+ DBUG_PRINT("tmptable", ("Opened table: '%s'.'%s'%p", table->s->db.str,
+ table->s->table_name.str, table));
DBUG_RETURN(table);
}
@@ -1221,9 +1221,9 @@ void THD::close_temporary_table(TABLE *table)
{
DBUG_ENTER("THD::close_temporary_table");
- DBUG_PRINT("tmptable", ("closing table: '%s'.'%s' 0x%lx alias: '%s'",
+ DBUG_PRINT("tmptable", ("closing table: '%s'.'%s'%p alias: '%s'",
table->s->db.str, table->s->table_name.str,
- (long) table, table->alias.c_ptr()));
+ table, table->alias.c_ptr()));
closefrm(table);
my_free(table);
diff --git a/sql/threadpool_generic.cc b/sql/threadpool_generic.cc
index 2ab874b2232..880593a17e9 100644
--- a/sql/threadpool_generic.cc
+++ b/sql/threadpool_generic.cc
@@ -450,7 +450,7 @@ static void* native_event_get_userdata(native_event *event)
static int io_poll_create()
{
HANDLE h= CreateIoCompletionPort(INVALID_HANDLE_VALUE, 0, 0, 0);
- return (int)h;
+ return PtrToInt(h);
}
@@ -476,7 +476,7 @@ int io_poll_start_read(int pollfd, int fd, void *, void *opt)
static int io_poll_associate_fd(int pollfd, int fd, void *data, void *opt)
{
- HANDLE h= CreateIoCompletionPort((HANDLE)fd, (HANDLE)pollfd, (ULONG_PTR)data, 0);
+ HANDLE h= CreateIoCompletionPort(IntToPtr(fd), IntToPtr(pollfd), (ULONG_PTR)data, 0);
if (!h)
return -1;
return io_poll_start_read(pollfd,fd, 0, opt);
diff --git a/sql/unireg.cc b/sql/unireg.cc
index 0bb8a4e77c6..8dbfed1cd7e 100644
--- a/sql/unireg.cc
+++ b/sql/unireg.cc
@@ -452,9 +452,9 @@ static uint pack_keys(uchar *keybuff, uint key_count, KEY *keyinfo,
int2store(pos+6, key->block_size);
pos+=8;
key_parts+=key->user_defined_key_parts;
- DBUG_PRINT("loop", ("flags: %lu key_parts: %d key_part: 0x%lx",
+ DBUG_PRINT("loop", ("flags: %lu key_parts: %d key_part: %p",
key->flags, key->user_defined_key_parts,
- (long) key->key_part));
+ key->key_part));
for (key_part=key->key_part,key_part_end=key_part+key->user_defined_key_parts ;
key_part != key_part_end ;
key_part++)
diff --git a/storage/connect/tabmysql.cpp b/storage/connect/tabmysql.cpp
index d1e2ae69608..196ac16c7b0 100644
--- a/storage/connect/tabmysql.cpp
+++ b/storage/connect/tabmysql.cpp
@@ -124,8 +124,8 @@ bool MYSQLDEF::GetServerInfo(PGLOBAL g, const char *server_name)
DBUG_RETURN(true);
} // endif server
- DBUG_PRINT("info", ("get_server_by_name returned server at %lx",
- (size_t) server));
+ DBUG_PRINT("info", ("get_server_by_name returned server at %p",
+ server));
// TODO: We need to examine which of these can really be NULL
Hostname = PlugDup(g, server->host);
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
index 6b88ab6f2bb..ec05127c475 100644
--- a/storage/federated/ha_federated.cc
+++ b/storage/federated/ha_federated.cc
@@ -614,8 +614,8 @@ int get_connection(MEM_ROOT *mem_root, FEDERATED_SHARE *share)
error_num=1;
goto error;
}
- DBUG_PRINT("info", ("get_server_by_name returned server at %lx",
- (long unsigned int) server));
+ DBUG_PRINT("info", ("get_server_by_name returned server at %p",
+ server));
/*
Most of these should never be empty strings, error handling will
@@ -716,15 +716,15 @@ static int parse_url(MEM_ROOT *mem_root, FEDERATED_SHARE *share, TABLE *table,
share->port= 0;
share->socket= 0;
- DBUG_PRINT("info", ("share at %lx", (long unsigned int) share));
+ DBUG_PRINT("info", ("share at %p", share));
DBUG_PRINT("info", ("Length: %u", (uint) table->s->connect_string.length));
DBUG_PRINT("info", ("String: '%.*s'", (int) table->s->connect_string.length,
table->s->connect_string.str));
share->connection_string= strmake_root(mem_root, table->s->connect_string.str,
table->s->connect_string.length);
- DBUG_PRINT("info",("parse_url alloced share->connection_string %lx",
- (long unsigned int) share->connection_string));
+ DBUG_PRINT("info",("parse_url alloced share->connection_string %p",
+ share->connection_string));
DBUG_PRINT("info",("share->connection_string %s",share->connection_string));
/*
@@ -737,9 +737,9 @@ static int parse_url(MEM_ROOT *mem_root, FEDERATED_SHARE *share, TABLE *table,
DBUG_PRINT("info",
("share->connection_string %s internal format \
- share->connection_string %lx",
+ share->connection_string %p",
share->connection_string,
- (long unsigned int) share->connection_string));
+ share->connection_string));
/* ok, so we do a little parsing, but not completely! */
share->parsed= FALSE;
@@ -793,8 +793,8 @@ static int parse_url(MEM_ROOT *mem_root, FEDERATED_SHARE *share, TABLE *table,
// Add a null for later termination of table name
share->connection_string[table->s->connect_string.length]= 0;
share->scheme= share->connection_string;
- DBUG_PRINT("info",("parse_url alloced share->scheme %lx",
- (long unsigned int) share->scheme));
+ DBUG_PRINT("info",("parse_url alloced share->scheme %p",
+ share->scheme));
/*
remove addition of null terminator and store length
diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc
index ed97c08ddf7..8f9b499c611 100644
--- a/storage/federatedx/ha_federatedx.cc
+++ b/storage/federatedx/ha_federatedx.cc
@@ -553,8 +553,8 @@ int get_connection(MEM_ROOT *mem_root, FEDERATEDX_SHARE *share)
error_num=1;
goto error;
}
- DBUG_PRINT("info", ("get_server_by_name returned server at %lx",
- (long unsigned int) server));
+ DBUG_PRINT("info", ("get_server_by_name returned server at %p",
+ server));
/*
Most of these should never be empty strings, error handling will
@@ -655,15 +655,15 @@ static int parse_url(MEM_ROOT *mem_root, FEDERATEDX_SHARE *share,
share->port= 0;
share->socket= 0;
- DBUG_PRINT("info", ("share at %lx", (long unsigned int) share));
+ DBUG_PRINT("info", ("share at %p", share));
DBUG_PRINT("info", ("Length: %u", (uint) table_s->connect_string.length));
DBUG_PRINT("info", ("String: '%.*s'", (int) table_s->connect_string.length,
table_s->connect_string.str));
share->connection_string= strmake_root(mem_root, table_s->connect_string.str,
table_s->connect_string.length);
- DBUG_PRINT("info",("parse_url alloced share->connection_string %lx",
- (long unsigned int) share->connection_string));
+ DBUG_PRINT("info",("parse_url alloced share->connection_string %p",
+ share->connection_string));
DBUG_PRINT("info",("share->connection_string: %s",share->connection_string));
/*
@@ -676,9 +676,9 @@ static int parse_url(MEM_ROOT *mem_root, FEDERATEDX_SHARE *share,
DBUG_PRINT("info",
("share->connection_string: %s internal format "
- "share->connection_string: %lx",
+ "share->connection_string: %p",
share->connection_string,
- (ulong) share->connection_string));
+ share->connection_string));
/* ok, so we do a little parsing, but not completely! */
share->parsed= FALSE;
@@ -731,8 +731,8 @@ static int parse_url(MEM_ROOT *mem_root, FEDERATEDX_SHARE *share,
// Add a null for later termination of table name
share->connection_string[table_s->connect_string.length]= 0;
share->scheme= share->connection_string;
- DBUG_PRINT("info",("parse_url alloced share->scheme: %lx",
- (ulong) share->scheme));
+ DBUG_PRINT("info",("parse_url alloced share->scheme: %p",
+ share->scheme));
/*
Remove addition of null terminator and store length
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc
index eac8cf7c924..5ce8b1d584d 100644
--- a/storage/innobase/buf/buf0buf.cc
+++ b/storage/innobase/buf/buf0buf.cc
@@ -790,7 +790,7 @@ buf_page_is_checksum_valid_none(
&& srv_checksum_algorithm == SRV_CHECKSUM_ALGORITHM_STRICT_NONE) {
fprintf(log_file,
"page::%llu; none checksum: calculated"
- " = " ULINTPF "; recorded checksum_field1 = " ULINTPF
+ " = %lu; recorded checksum_field1 = " ULINTPF
" recorded checksum_field2 = " ULINTPF "\n",
cur_page_num, BUF_NO_CHECKSUM_MAGIC,
checksum_field1, checksum_field2);
diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc
index 837e60882e6..0c015be12f2 100644
--- a/storage/innobase/os/os0file.cc
+++ b/storage/innobase/os/os0file.cc
@@ -7531,9 +7531,9 @@ AIO::to_file(FILE* file) const
fprintf(file,
"%s IO for %s (offset=" UINT64PF
- ", size=" ULINTPF ")\n",
+ ", size=%lu)\n",
slot.type.is_read() ? "read" : "write",
- slot.name, slot.offset, slot.len);
+ slot.name, slot.offset, (unsigned long)(slot.len));
}
}
diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc
index 868281be572..33ec4ea7db1 100644
--- a/storage/maria/ha_maria.cc
+++ b/storage/maria/ha_maria.cc
@@ -620,8 +620,8 @@ static int table2maria(TABLE *table_arg, data_file_type row_type,
}
}
}
- DBUG_PRINT("loop", ("found: 0x%lx recpos: %d minpos: %d length: %d",
- (long) found, recpos, minpos, length));
+ DBUG_PRINT("loop", ("found: %p recpos: %d minpos: %d length: %d",
+ found, recpos, minpos, length));
if (!found)
break;
diff --git a/storage/maria/ma_bitmap.c b/storage/maria/ma_bitmap.c
index 0abfa34a85f..d50df294b8a 100644
--- a/storage/maria/ma_bitmap.c
+++ b/storage/maria/ma_bitmap.c
@@ -864,8 +864,8 @@ static void _ma_print_bitmap_changes(MARIA_FILE_BITMAP *bitmap)
end= bitmap->map + bitmap->used_size;
DBUG_LOCK_FILE;
- fprintf(DBUG_FILE,"\nBitmap page changes at page: %lu bitmap: 0x%lx\n",
- (ulong) bitmap->page, (long) bitmap->map);
+ fprintf(DBUG_FILE,"\nBitmap page changes at page: %lu bitmap: %p\n",
+ (ulong) bitmap->page, bitmap->map);
page= (ulong) bitmap->page+1;
for (pos= bitmap->map, org_pos= bitmap->map + bitmap->block_size ;
diff --git a/storage/maria/ma_check.c b/storage/maria/ma_check.c
index 2b27207e601..078ef813605 100644
--- a/storage/maria/ma_check.c
+++ b/storage/maria/ma_check.c
@@ -2519,8 +2519,8 @@ static int maria_drop_all_indexes(HA_CHECK *param, MARIA_HA *info,
DBUG_PRINT("repair", ("creating missing indexes"));
for (i= 0; i < share->base.keys; i++)
{
- DBUG_PRINT("repair", ("index #: %u key_root: 0x%lx active: %d",
- i, (long) state->key_root[i],
+ DBUG_PRINT("repair", ("index #: %u key_root:%lld active: %d",
+ i, state->key_root[i],
maria_is_key_active(state->key_map, i)));
if ((state->key_root[i] != HA_OFFSET_ERROR) &&
!maria_is_key_active(state->key_map, i))
@@ -4477,8 +4477,8 @@ int maria_repair_parallel(HA_CHECK *param, register MARIA_HA *info,
*/
sort_param[i].read_cache= ((rep_quick || !i) ? param->read_cache :
new_data_cache);
- DBUG_PRINT("io_cache_share", ("thread: %u read_cache: 0x%lx",
- i, (long) &sort_param[i].read_cache));
+ DBUG_PRINT("io_cache_share", ("thread: %u read_cache: %p",
+ i, &sort_param[i].read_cache));
/*
two approaches: the same amount of memory for each thread
diff --git a/storage/maria/ma_checkpoint.c b/storage/maria/ma_checkpoint.c
index c00278781ea..84c142ca151 100644
--- a/storage/maria/ma_checkpoint.c
+++ b/storage/maria/ma_checkpoint.c
@@ -170,7 +170,7 @@ static int really_execute_checkpoint(void)
"Horizon" is a lower bound of the LSN of the next log record.
*/
checkpoint_start_log_horizon= translog_get_horizon();
- DBUG_PRINT("info",("checkpoint_start_log_horizon (%lu,0x%lx)",
+ DBUG_PRINT("info",("checkpoint_start_log_horizon " LSN_FMT,
LSN_IN_PARTS(checkpoint_start_log_horizon)));
lsn_store(checkpoint_start_log_horizon_char, checkpoint_start_log_horizon);
@@ -333,10 +333,11 @@ int ma_checkpoint_init(ulong interval)
else if (interval > 0)
{
compile_time_assert(sizeof(void *) >= sizeof(ulong));
+ size_t intv= interval;
if ((res= mysql_thread_create(key_thread_checkpoint,
&checkpoint_control.thread, NULL,
ma_checkpoint_background,
- (void*) interval)))
+ (void*) intv)))
checkpoint_control.killed= TRUE;
}
else
@@ -375,7 +376,7 @@ static void flush_all_tables(int what_to_flush)
MA_STATE_INFO_WRITE_DONT_MOVE_OFFSET|
MA_STATE_INFO_WRITE_LOCK);
DBUG_PRINT("maria_flush_states",
- ("is_of_horizon: LSN (%lu,0x%lx)",
+ ("is_of_horizon: LSN " LSN_FMT,
LSN_IN_PARTS(info->s->state.is_of_horizon)));
break;
case 2:
@@ -546,8 +547,8 @@ pthread_handler_t ma_checkpoint_background(void *arg)
right after "case 0", thus having 'dfile' unset. So the thread cares only
about the interval's value when it started.
*/
- const ulong interval= (ulong)arg;
- uint sleeps, sleep_time;
+ const size_t interval= (size_t)arg;
+ size_t sleeps, sleep_time;
TRANSLOG_ADDRESS log_horizon_at_last_checkpoint=
translog_get_horizon();
ulonglong pagecache_flushes_at_last_checkpoint=
diff --git a/storage/maria/ma_close.c b/storage/maria/ma_close.c
index d89a69f02ab..882e9f585f1 100644
--- a/storage/maria/ma_close.c
+++ b/storage/maria/ma_close.c
@@ -30,9 +30,9 @@ int maria_close(register MARIA_HA *info)
MARIA_SHARE *share= info->s;
my_bool internal_table= share->internal_table;
DBUG_ENTER("maria_close");
- DBUG_PRINT("enter",("name: '%s' base: 0x%lx reopen: %u locks: %u",
+ DBUG_PRINT("enter",("name: '%s' base: %p reopen: %u locks: %u",
share->open_file_name.str,
- (long) info, (uint) share->reopen,
+ info, (uint) share->reopen,
(uint) share->tot_locks));
/* Check that we have unlocked key delete-links properly */
diff --git a/storage/maria/ma_commit.c b/storage/maria/ma_commit.c
index 358f564d3f1..68435a45c0a 100644
--- a/storage/maria/ma_commit.c
+++ b/storage/maria/ma_commit.c
@@ -121,7 +121,7 @@ int maria_begin(MARIA_HA *info)
if (unlikely(!trn))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
- DBUG_PRINT("info", ("TRN set to 0x%lx", (ulong) trn));
+ DBUG_PRINT("info", ("TRN set to %p", trn));
_ma_set_trn_for_table(info, trn);
}
DBUG_RETURN(0);
diff --git a/storage/maria/ma_control_file.c b/storage/maria/ma_control_file.c
index b46cf7e1765..1ccb67d5698 100644
--- a/storage/maria/ma_control_file.c
+++ b/storage/maria/ma_control_file.c
@@ -146,6 +146,8 @@ static CONTROL_FILE_ERROR create_control_file(const char *name,
{
uint32 sum;
uchar buffer[CF_CREATE_TIME_TOTAL_SIZE];
+ ulong rnd1,rnd2;
+
DBUG_ENTER("maria_create_control_file");
if ((control_file_fd= mysql_file_create(key_file_control, name, 0,
@@ -157,7 +159,9 @@ static CONTROL_FILE_ERROR create_control_file(const char *name,
cf_changeable_size= CF_CHANGEABLE_TOTAL_SIZE;
/* Create unique uuid for the control file */
- my_uuid_init((ulong) &buffer, (ulong) &maria_uuid);
+ my_random_bytes((uchar *)&rnd1, sizeof (rnd1));
+ my_random_bytes((uchar *)&rnd2, sizeof (rnd2));
+ my_uuid_init(rnd1, rnd2);
my_uuid(maria_uuid);
/* Prepare and write the file header */
diff --git a/storage/maria/ma_delete.c b/storage/maria/ma_delete.c
index 7921ab59a8f..c5a2378dc2b 100644
--- a/storage/maria/ma_delete.c
+++ b/storage/maria/ma_delete.c
@@ -559,9 +559,9 @@ static int del(MARIA_HA *info, MARIA_KEY *key,
MARIA_KEY ret_key;
MARIA_PAGE next_page;
DBUG_ENTER("del");
- DBUG_PRINT("enter",("leaf_page: %lu keypos: 0x%lx",
+ DBUG_PRINT("enter",("leaf_page: %lu keypos: %p",
(ulong) (leaf_page->pos / share->block_size),
- (ulong) keypos));
+ keypos));
DBUG_DUMP("leaf_buff", leaf_page->buff, leaf_page->size);
page_flag= leaf_page->flag;
@@ -773,9 +773,9 @@ static int underflow(MARIA_HA *info, MARIA_KEYDEF *keyinfo,
MARIA_KEY tmp_key, anc_key, leaf_key;
MARIA_PAGE next_page;
DBUG_ENTER("underflow");
- DBUG_PRINT("enter",("leaf_page: %lu keypos: 0x%lx",
+ DBUG_PRINT("enter",("leaf_page: %lu keypos: %p",
(ulong) (leaf_page->pos / share->block_size),
- (ulong) keypos));
+ keypos));
DBUG_DUMP("anc_buff", anc_page->buff, anc_page->size);
DBUG_DUMP("leaf_buff", leaf_page->buff, leaf_page->size);
@@ -918,8 +918,8 @@ static int underflow(MARIA_HA *info, MARIA_KEYDEF *keyinfo,
anc_end_pos= anc_buff + new_anc_length;
- DBUG_PRINT("test",("anc_buff: 0x%lx anc_end_pos: 0x%lx",
- (long) anc_buff, (long) anc_end_pos));
+ DBUG_PRINT("test",("anc_buff:%p anc_end_pos:%p",
+ anc_buff, anc_end_pos));
if (!first_key && !_ma_get_last_key(&anc_key, anc_page, keypos))
goto err;
@@ -1308,8 +1308,8 @@ static uint remove_key(MARIA_KEYDEF *keyinfo, uint page_flag, uint nod_flag,
int s_length;
uchar *start;
DBUG_ENTER("remove_key");
- DBUG_PRINT("enter", ("keypos: 0x%lx page_end: 0x%lx",
- (long) keypos, (long) page_end));
+ DBUG_PRINT("enter", ("keypos:%p page_end: %p",
+ keypos, page_end));
start= s_temp->key_pos= keypos;
s_temp->changed_length= 0;
diff --git a/storage/maria/ma_dynrec.c b/storage/maria/ma_dynrec.c
index 7f34b73089f..e5c108a18c6 100644
--- a/storage/maria/ma_dynrec.c
+++ b/storage/maria/ma_dynrec.c
@@ -1343,8 +1343,8 @@ ulong _ma_rec_unpack(register MARIA_HA *info, register uchar *to, uchar *from,
err:
_ma_set_fatal_error(info->s, HA_ERR_WRONG_IN_RECORD);
- DBUG_PRINT("error",("to_end: 0x%lx -> 0x%lx from_end: 0x%lx -> 0x%lx",
- (long) to, (long) to_end, (long) from, (long) from_end));
+ DBUG_PRINT("error",("to_end: %p -> %p from_end: %p -> %p",
+ to, to_end, from, from_end));
DBUG_DUMP("from", info->rec_buff, info->s->base.min_pack_length);
DBUG_RETURN(MY_FILE_ERROR);
} /* _ma_rec_unpack */
diff --git a/storage/maria/ma_keycache.c b/storage/maria/ma_keycache.c
index c3083445aee..39459c486fd 100644
--- a/storage/maria/ma_keycache.c
+++ b/storage/maria/ma_keycache.c
@@ -54,8 +54,8 @@ int maria_assign_to_pagecache(MARIA_HA *info,
MARIA_SHARE* share= info->s;
DBUG_ENTER("maria_assign_to_pagecache");
DBUG_PRINT("enter",
- ("old_pagecache_handle: 0x%lx new_pagecache_handle: 0x%lx",
- (long) share->pagecache, (long) pagecache));
+ ("old_pagecache_handle:%p new_pagecache_handle:%p",
+ share->pagecache, pagecache));
/*
Skip operation if we didn't change key cache. This can happen if we
diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c
index defa11ad6b4..c9d2362d7e2 100644
--- a/storage/maria/ma_loghandler.c
+++ b/storage/maria/ma_loghandler.c
@@ -909,7 +909,7 @@ char *translog_filename_by_fileno(uint32 file_no, char *path)
length= (uint) (int10_to_str(file_no, buff, 10) - buff);
strmov(end - length +1, buff);
- DBUG_PRINT("info", ("Path: '%s' path: 0x%lx", path, (ulong) path));
+ DBUG_PRINT("info", ("Path: '%s' path: %p", path, path));
DBUG_RETURN(path);
}
@@ -1013,8 +1013,8 @@ static TRANSLOG_FILE *get_logfile_by_number(uint32 file_no)
file= *dynamic_element(&log_descriptor.open_files,
log_descriptor.max_file - file_no, TRANSLOG_FILE **);
mysql_rwlock_unlock(&log_descriptor.open_files_lock);
- DBUG_PRINT("info", ("File 0x%lx File no: %lu, File handler: %d",
- (ulong)file, (ulong)file_no,
+ DBUG_PRINT("info", ("File %p File no: %u, File handler: %d",
+ file, file_no,
(file ? file->handler.file : -1)));
DBUG_ASSERT(!file || file->number == file_no);
DBUG_RETURN(file);
@@ -1127,7 +1127,7 @@ static my_bool translog_max_lsn_to_header(File file, LSN lsn)
my_bool rc;
DBUG_ENTER("translog_max_lsn_to_header");
DBUG_PRINT("enter", ("File descriptor: %ld "
- "lsn: (%lu,0x%lx)",
+ "lsn: " LSN_FMT,
(long) file,
LSN_IN_PARTS(lsn)));
@@ -1200,7 +1200,7 @@ my_bool translog_read_file_header(LOGHANDLER_FILE_INFO *desc, File file)
translog_interpret_file_header(desc, page_buff);
DBUG_PRINT("info", ("timestamp: %llu aria ver: %lu mysql ver: %lu "
"server id %lu page size %lu file number %lu "
- "max lsn: (%lu,0x%lx)",
+ "max lsn: " LSN_FMT,
(ulonglong) desc->timestamp,
(ulong) desc->maria_version,
(ulong) desc->mysql_version,
@@ -1229,7 +1229,7 @@ static my_bool translog_set_lsn_for_files(uint32 from_file, uint32 to_file,
{
uint32 file;
DBUG_ENTER("translog_set_lsn_for_files");
- DBUG_PRINT("enter", ("From: %lu to: %lu lsn: (%lu,0x%lx) locked: %d",
+ DBUG_PRINT("enter", ("From: %lu to: %lu lsn: " LSN_FMT " locked: %d",
(ulong) from_file, (ulong) to_file,
LSN_IN_PARTS(lsn),
is_locked));
@@ -1458,7 +1458,7 @@ LSN translog_get_file_max_lsn_stored(uint32 file)
info.max_lsn= LSN_ERROR;
}
- DBUG_PRINT("info", ("Max lsn: (%lu,0x%lx)", LSN_IN_PARTS(info.max_lsn)));
+ DBUG_PRINT("info", ("Max lsn: " LSN_FMT, LSN_IN_PARTS(info.max_lsn)));
DBUG_RETURN(info.max_lsn);
}
}
@@ -1482,8 +1482,8 @@ static my_bool translog_buffer_init(struct st_translog_buffer *buffer, int num)
buffer->pre_force_close_horizon=
buffer->prev_last_lsn= buffer->last_lsn=
LSN_IMPOSSIBLE;
- DBUG_PRINT("info", ("last_lsn and prev_last_lsn set to 0 buffer: 0x%lx",
- (ulong) buffer));
+ DBUG_PRINT("info", ("last_lsn and prev_last_lsn set to 0 buffer: %p",
+ buffer));
buffer->buffer_no= (uint8) num;
/* This Buffer File */
@@ -1684,8 +1684,8 @@ static void translog_buffer_lock(struct st_translog_buffer *buffer)
{
DBUG_ENTER("translog_buffer_lock");
DBUG_PRINT("enter",
- ("Lock buffer #%u: (0x%lx)", (uint) buffer->buffer_no,
- (ulong) buffer));
+ ("Lock buffer #%u: %p", buffer->buffer_no,
+ buffer));
mysql_mutex_lock(&buffer->mutex);
DBUG_VOID_RETURN;
}
@@ -1706,8 +1706,8 @@ static void translog_buffer_lock(struct st_translog_buffer *buffer)
static void translog_buffer_unlock(struct st_translog_buffer *buffer)
{
DBUG_ENTER("translog_buffer_unlock");
- DBUG_PRINT("enter", ("Unlock buffer... #%u (0x%lx)",
- (uint) buffer->buffer_no, (ulong) buffer));
+ DBUG_PRINT("enter", ("Unlock buffer... #%u (%p)",
+ (uint) buffer->buffer_no, buffer));
mysql_mutex_unlock(&buffer->mutex);
DBUG_VOID_RETURN;
@@ -1751,7 +1751,7 @@ static void translog_new_page_header(TRANSLOG_ADDRESS *horizon,
if (log_descriptor.flags & TRANSLOG_PAGE_CRC)
{
#ifndef DBUG_OFF
- DBUG_PRINT("info", ("write 0x11223344 CRC to (%lu,0x%lx)",
+ DBUG_PRINT("info", ("write 0x11223344 CRC to " LSN_FMT,
LSN_IN_PARTS(*horizon)));
/* This will be overwritten by real CRC; This is just for debugging */
int4store(ptr, 0x11223344);
@@ -1777,9 +1777,9 @@ static void translog_new_page_header(TRANSLOG_ADDRESS *horizon,
cursor->buffer->size+= len;
}
cursor->ptr= ptr;
- DBUG_PRINT("info", ("NewP buffer #%u: 0x%lx chaser: %d Size: %lu (%lu) "
- "Horizon: (%lu,0x%lx)",
- (uint) cursor->buffer->buffer_no, (ulong) cursor->buffer,
+ DBUG_PRINT("info", ("NewP buffer #%u: %p chaser: %d Size: %lu (%lu) "
+ "Horizon: " LSN_FMT,
+ (uint) cursor->buffer->buffer_no, cursor->buffer,
cursor->chaser, (ulong) cursor->buffer->size,
(ulong) (cursor->ptr - cursor->buffer->buffer),
LSN_IN_PARTS(*horizon)));
@@ -1882,14 +1882,14 @@ static void translog_finish_page(TRANSLOG_ADDRESS *horizon,
uint16 left= TRANSLOG_PAGE_SIZE - cursor->current_page_fill;
uchar *page= cursor->ptr - cursor->current_page_fill;
DBUG_ENTER("translog_finish_page");
- DBUG_PRINT("enter", ("Buffer: #%u 0x%lx "
- "Buffer addr: (%lu,0x%lx) "
- "Page addr: (%lu,0x%lx) "
+ DBUG_PRINT("enter", ("Buffer: #%u %p "
+ "Buffer addr: " LSN_FMT " "
+ "Page addr: " LSN_FMT " "
"size:%lu (%lu) Pg:%u left:%u",
- (uint) cursor->buffer_no, (ulong) cursor->buffer,
+ (uint) cursor->buffer_no, cursor->buffer,
LSN_IN_PARTS(cursor->buffer->offset),
- (ulong) LSN_FILE_NO(*horizon),
- (ulong) (LSN_OFFSET(*horizon) -
+ LSN_FILE_NO(*horizon),
+ (LSN_OFFSET(*horizon) -
cursor->current_page_fill),
(ulong) cursor->buffer->size,
(ulong) (cursor->ptr -cursor->buffer->buffer),
@@ -1914,10 +1914,10 @@ static void translog_finish_page(TRANSLOG_ADDRESS *horizon,
cursor->buffer->size+= left;
/* We are finishing the page so reset the counter */
cursor->current_page_fill= 0;
- DBUG_PRINT("info", ("Finish Page buffer #%u: 0x%lx "
+ DBUG_PRINT("info", ("Finish Page buffer #%u: %p "
"chaser: %d Size: %lu (%lu)",
(uint) cursor->buffer->buffer_no,
- (ulong) cursor->buffer, cursor->chaser,
+ cursor->buffer, cursor->chaser,
(ulong) cursor->buffer->size,
(ulong) (cursor->ptr - cursor->buffer->buffer)));
translog_check_cursor(cursor);
@@ -1956,9 +1956,9 @@ static void translog_finish_page(TRANSLOG_ADDRESS *horizon,
static void translog_wait_for_closing(struct st_translog_buffer *buffer)
{
DBUG_ENTER("translog_wait_for_closing");
- DBUG_PRINT("enter", ("Buffer #%u 0x%lx copies in progress: %u "
+ DBUG_PRINT("enter", ("Buffer #%u %p copies in progress: %u "
"is closing %u File: %d size: %lu",
- (uint) buffer->buffer_no, (ulong) buffer,
+ (uint) buffer->buffer_no, buffer,
(uint) buffer->copy_to_buffer_in_progress,
(uint) buffer->is_closing_buffer,
(buffer->file ? buffer->file->handler.file : -1),
@@ -1967,12 +1967,12 @@ static void translog_wait_for_closing(struct st_translog_buffer *buffer)
while (buffer->is_closing_buffer)
{
- DBUG_PRINT("info", ("wait for writers... buffer: #%u 0x%lx",
- (uint) buffer->buffer_no, (ulong) buffer));
+ DBUG_PRINT("info", ("wait for writers... buffer: #%u %p",
+ (uint) buffer->buffer_no, buffer));
DBUG_ASSERT(buffer->file != NULL);
mysql_cond_wait(&buffer->waiting_filling_buffer, &buffer->mutex);
- DBUG_PRINT("info", ("wait for writers done buffer: #%u 0x%lx",
- (uint) buffer->buffer_no, (ulong) buffer));
+ DBUG_PRINT("info", ("wait for writers done buffer: #%u %p",
+ (uint) buffer->buffer_no, buffer));
}
DBUG_VOID_RETURN;
@@ -1988,9 +1988,9 @@ static void translog_wait_for_closing(struct st_translog_buffer *buffer)
static void translog_wait_for_writers(struct st_translog_buffer *buffer)
{
DBUG_ENTER("translog_wait_for_writers");
- DBUG_PRINT("enter", ("Buffer #%u 0x%lx copies in progress: %u "
+ DBUG_PRINT("enter", ("Buffer #%u %p copies in progress: %u "
"is closing %u File: %d size: %lu",
- (uint) buffer->buffer_no, (ulong) buffer,
+ (uint) buffer->buffer_no, buffer,
(uint) buffer->copy_to_buffer_in_progress,
(uint) buffer->is_closing_buffer,
(buffer->file ? buffer->file->handler.file : -1),
@@ -1999,12 +1999,12 @@ static void translog_wait_for_writers(struct st_translog_buffer *buffer)
while (buffer->copy_to_buffer_in_progress)
{
- DBUG_PRINT("info", ("wait for writers... buffer: #%u 0x%lx",
- (uint) buffer->buffer_no, (ulong) buffer));
+ DBUG_PRINT("info", ("wait for writers... buffer: #%u %p",
+ (uint) buffer->buffer_no, buffer));
DBUG_ASSERT(buffer->file != NULL);
mysql_cond_wait(&buffer->waiting_filling_buffer, &buffer->mutex);
- DBUG_PRINT("info", ("wait for writers done buffer: #%u 0x%lx",
- (uint) buffer->buffer_no, (ulong) buffer));
+ DBUG_PRINT("info", ("wait for writers done buffer: #%u %p",
+ (uint) buffer->buffer_no, buffer));
}
DBUG_VOID_RETURN;
@@ -2029,9 +2029,9 @@ static void translog_wait_for_buffer_free(struct st_translog_buffer *buffer)
TRANSLOG_FILE *file= buffer->file;
uint8 ver= buffer->ver;
DBUG_ENTER("translog_wait_for_buffer_free");
- DBUG_PRINT("enter", ("Buffer #%u 0x%lx copies in progress: %u "
+ DBUG_PRINT("enter", ("Buffer #%u %p copies in progress: %u "
"is closing %u File: %d size: %lu",
- (uint) buffer->buffer_no, (ulong) buffer,
+ (uint) buffer->buffer_no, buffer,
(uint) buffer->copy_to_buffer_in_progress,
(uint) buffer->is_closing_buffer,
(buffer->file ? buffer->file->handler.file : -1),
@@ -2044,11 +2044,11 @@ static void translog_wait_for_buffer_free(struct st_translog_buffer *buffer)
while (buffer->file != NULL)
{
- DBUG_PRINT("info", ("wait for writers... buffer: #%u 0x%lx",
- (uint) buffer->buffer_no, (ulong) buffer));
+ DBUG_PRINT("info", ("wait for writers... buffer: #%u %p",
+ (uint) buffer->buffer_no, buffer));
mysql_cond_wait(&buffer->waiting_filling_buffer, &buffer->mutex);
- DBUG_PRINT("info", ("wait for writers done. buffer: #%u 0x%lx",
- (uint) buffer->buffer_no, (ulong) buffer));
+ DBUG_PRINT("info", ("wait for writers done. buffer: #%u %p",
+ (uint) buffer->buffer_no, buffer));
}
DBUG_ASSERT(buffer->copy_to_buffer_in_progress == 0);
DBUG_VOID_RETURN;
@@ -2096,15 +2096,15 @@ static void translog_start_buffer(struct st_translog_buffer *buffer,
{
DBUG_ENTER("translog_start_buffer");
DBUG_PRINT("enter",
- ("Assign buffer: #%u (0x%lx) offset: 0x%lx(%lu)",
- (uint) buffer->buffer_no, (ulong) buffer,
- (ulong) LSN_OFFSET(log_descriptor.horizon),
- (ulong) LSN_OFFSET(log_descriptor.horizon)));
+ ("Assign buffer: #%u (%p) offset: 0x%x(%u)",
+ (uint) buffer->buffer_no, buffer,
+ (uint) LSN_OFFSET(log_descriptor.horizon),
+ (uint) LSN_OFFSET(log_descriptor.horizon)));
DBUG_ASSERT(buffer_no == buffer->buffer_no);
buffer->pre_force_close_horizon=
buffer->prev_last_lsn= buffer->last_lsn= LSN_IMPOSSIBLE;
- DBUG_PRINT("info", ("last_lsn and prev_last_lsn set to 0 buffer: 0x%lx",
- (ulong) buffer));
+ DBUG_PRINT("info", ("last_lsn and prev_last_lsn set to 0 buffer: %p",
+ buffer));
buffer->offset= log_descriptor.horizon;
buffer->next_buffer_offset= LSN_IMPOSSIBLE;
buffer->file= get_current_logfile();
@@ -2112,11 +2112,11 @@ static void translog_start_buffer(struct st_translog_buffer *buffer,
buffer->size= 0;
buffer->skipped_data= 0;
translog_cursor_init(cursor, buffer, buffer_no);
- DBUG_PRINT("info", ("file: #%ld (%d) init cursor #%u: 0x%lx "
+ DBUG_PRINT("info", ("file: #%ld (%d) init cursor #%u: %p "
"chaser: %d Size: %lu (%lu)",
(long) (buffer->file ? buffer->file->number : 0),
(buffer->file ? buffer->file->handler.file : -1),
- (uint) cursor->buffer->buffer_no, (ulong) cursor->buffer,
+ (uint) cursor->buffer->buffer_no, cursor->buffer,
cursor->chaser, (ulong) cursor->buffer->size,
(ulong) (cursor->ptr - cursor->buffer->buffer)));
translog_check_cursor(cursor);
@@ -2153,7 +2153,7 @@ static my_bool translog_buffer_next(TRANSLOG_ADDRESS *horizon,
my_bool chasing= cursor->chaser;
DBUG_ENTER("translog_buffer_next");
- DBUG_PRINT("info", ("horizon: (%lu,0x%lx) chasing: %d",
+ DBUG_PRINT("info", ("horizon: " LSN_FMT " chasing: %d",
LSN_IN_PARTS(log_descriptor.horizon), chasing));
DBUG_ASSERT(cmp_translog_addr(log_descriptor.horizon, *horizon) >= 0);
@@ -2205,9 +2205,9 @@ static my_bool translog_buffer_next(TRANSLOG_ADDRESS *horizon,
BUFFER_MAX_LSN(log_descriptor.buffers + old_buffer_no);
}
log_descriptor.buffers[old_buffer_no].next_buffer_offset= new_buffer->offset;
- DBUG_PRINT("info", ("prev_last_lsn set to (%lu,0x%lx) buffer: 0x%lx",
+ DBUG_PRINT("info", ("prev_last_lsn set to " LSN_FMT " buffer:%p",
LSN_IN_PARTS(new_buffer->prev_last_lsn),
- (ulong) new_buffer));
+ new_buffer));
translog_new_page_header(horizon, cursor);
DBUG_RETURN(0);
}
@@ -2230,9 +2230,9 @@ static void translog_set_sent_to_disk(struct st_translog_buffer *buffer)
DBUG_ENTER("translog_set_sent_to_disk");
mysql_mutex_lock(&log_descriptor.sent_to_disk_lock);
- DBUG_PRINT("enter", ("lsn: (%lu,0x%lx) in_buffers: (%lu,0x%lx) "
- "in_buffers_only: (%lu,0x%lx) start: (%lu,0x%lx) "
- "sent_to_disk: (%lu,0x%lx)",
+ DBUG_PRINT("enter", ("lsn: " LSN_FMT " in_buffers: " LSN_FMT " "
+ "in_buffers_only: " LSN_FMT " start: " LSN_FMT " "
+ "sent_to_disk: " LSN_FMT,
LSN_IN_PARTS(lsn),
LSN_IN_PARTS(in_buffers),
LSN_IN_PARTS(log_descriptor.log_start),
@@ -2270,8 +2270,8 @@ static void translog_set_only_in_buffers(TRANSLOG_ADDRESS in_buffers)
{
DBUG_ENTER("translog_set_only_in_buffers");
mysql_mutex_lock(&log_descriptor.sent_to_disk_lock);
- DBUG_PRINT("enter", ("in_buffers: (%lu,0x%lx) "
- "in_buffers_only: (%lu,0x%lx)",
+ DBUG_PRINT("enter", ("in_buffers: " LSN_FMT " "
+ "in_buffers_only: " LSN_FMT,
LSN_IN_PARTS(in_buffers),
LSN_IN_PARTS(log_descriptor.in_buffers_only)));
/* LSN_IMPOSSIBLE == 0 => it will work for very first time */
@@ -2325,7 +2325,7 @@ static LSN translog_get_sent_to_disk()
DBUG_ENTER("translog_get_sent_to_disk");
mysql_mutex_lock(&log_descriptor.sent_to_disk_lock);
lsn= log_descriptor.sent_to_disk;
- DBUG_PRINT("info", ("sent to disk up to (%lu,0x%lx)", LSN_IN_PARTS(lsn)));
+ DBUG_PRINT("info", ("sent to disk up to " LSN_FMT, LSN_IN_PARTS(lsn)));
mysql_mutex_unlock(&log_descriptor.sent_to_disk_lock);
DBUG_RETURN(lsn);
}
@@ -2534,9 +2534,9 @@ my_bool translog_prev_buffer_flush_wait(struct st_translog_buffer *buffer)
TRANSLOG_FILE *file= buffer->file;
uint8 ver= buffer->ver;
DBUG_ENTER("translog_prev_buffer_flush_wait");
- DBUG_PRINT("enter", ("buffer: 0x%lx #%u offset: (%lu,0x%lx) "
- "prev sent: (%lu,0x%lx) prev offset: (%lu,0x%lx)",
- (ulong) buffer, (uint) buffer->buffer_no,
+ DBUG_PRINT("enter", ("buffer: %p #%u offset: " LSN_FMT " "
+ "prev sent: " LSN_FMT " prev offset: " LSN_FMT,
+ buffer, (uint) buffer->buffer_no,
LSN_IN_PARTS(buffer->offset),
LSN_IN_PARTS(buffer->prev_sent_to_disk),
LSN_IN_PARTS(buffer->prev_buffer_offset)));
@@ -2575,8 +2575,8 @@ static my_bool translog_buffer_flush(struct st_translog_buffer *buffer)
uint skipped_data;
DBUG_ENTER("translog_buffer_flush");
DBUG_PRINT("enter",
- ("Buffer: #%u 0x%lx file: %d offset: (%lu,0x%lx) size: %lu",
- (uint) buffer->buffer_no, (ulong) buffer,
+ ("Buffer: #%u %p file: %d offset: " LSN_FMT " size: %lu",
+ (uint) buffer->buffer_no, buffer,
buffer->file->handler.file,
LSN_IN_PARTS(buffer->offset),
(ulong) buffer->size));
@@ -2615,11 +2615,11 @@ static my_bool translog_buffer_flush(struct st_translog_buffer *buffer)
#ifndef DBUG_OFF
TRANSLOG_ADDRESS addr= (buffer->offset + i);
#endif
- DBUG_PRINT("info", ("send log form %lu till %lu address: (%lu,0x%lx) "
- "page #: %lu buffer size: %lu buffer: 0x%lx",
+ DBUG_PRINT("info", ("send log form %lu till %lu address: " LSN_FMT " "
+ "page #: %lu buffer size: %lu buffer: %p",
(ulong) i, (ulong) (i + TRANSLOG_PAGE_SIZE),
LSN_IN_PARTS(addr), (ulong) pg, (ulong) buffer->size,
- (ulong) buffer));
+ buffer));
DBUG_ASSERT(log_descriptor.pagecache->block_size == TRANSLOG_PAGE_SIZE);
DBUG_ASSERT(i + TRANSLOG_PAGE_SIZE <= buffer->size);
if (translog_status != TRANSLOG_OK && translog_status != TRANSLOG_SHUTDOWN)
@@ -2636,7 +2636,7 @@ static my_bool translog_buffer_flush(struct st_translog_buffer *buffer)
TRANSLOG_PAGE_SIZE - skipped_data))
{
DBUG_PRINT("error",
- ("Can't write page (%lu,0x%lx) to pagecache, error: %d",
+ ("Can't write page " LSN_FMT " to pagecache, error: %d",
(ulong) buffer->file->number,
(ulong) (LSN_OFFSET(buffer->offset)+ i),
my_errno));
@@ -2651,7 +2651,7 @@ static my_bool translog_buffer_flush(struct st_translog_buffer *buffer)
LSN_OFFSET(buffer->offset) + buffer->skipped_data,
log_write_flags))
{
- DBUG_PRINT("error", ("Can't write buffer (%lu,0x%lx) size %lu "
+ DBUG_PRINT("error", ("Can't write buffer " LSN_FMT " size %lu "
"to the disk (%d)",
(ulong) file->handler.file,
(ulong) LSN_OFFSET(buffer->offset),
@@ -2874,7 +2874,7 @@ static my_bool translog_page_validator(int res, PAGECACHE_IO_HOOK_ARGS *args)
if ((pgcache_page_no_t) uint3korr(page) != page_no ||
(uint32) uint3korr(page + 3) != data->number)
{
- DBUG_PRINT("error", ("Page (%lu,0x%lx): "
+ DBUG_PRINT("error", ("Page " LSN_FMT ": "
"page address written in the page is incorrect: "
"File %lu instead of %lu or page %lu instead of %lu",
(ulong) data->number, (ulong) offset,
@@ -2888,7 +2888,7 @@ static my_bool translog_page_validator(int res, PAGECACHE_IO_HOOK_ARGS *args)
if (flags & ~(TRANSLOG_PAGE_CRC | TRANSLOG_SECTOR_PROTECTION |
TRANSLOG_RECORD_CRC))
{
- DBUG_PRINT("error", ("Page (%lu,0x%lx): "
+ DBUG_PRINT("error", ("Page " LSN_FMT ": "
"Garbage in the page flags field detected : %x",
(ulong) data->number, (ulong) offset,
(uint) flags));
@@ -2902,7 +2902,7 @@ static my_bool translog_page_validator(int res, PAGECACHE_IO_HOOK_ARGS *args)
this_page_page_overhead);
if (crc != uint4korr(page_pos))
{
- DBUG_PRINT("error", ("Page (%lu,0x%lx): "
+ DBUG_PRINT("error", ("Page " LSN_FMT ": "
"CRC mismatch: calculated: %lx on the page %lx",
(ulong) data->number, (ulong) offset,
(ulong) crc, (ulong) uint4korr(page_pos)));
@@ -2985,10 +2985,10 @@ static uchar *translog_get_page(TRANSLOG_VALIDATOR_DATA *data, uchar *buffer,
uint32 file_no= LSN_FILE_NO(addr);
TRANSLOG_FILE *file;
DBUG_ENTER("translog_get_page");
- DBUG_PRINT("enter", ("File: %lu Offset: %lu(0x%lx)",
- (ulong) file_no,
- (ulong) LSN_OFFSET(addr),
- (ulong) LSN_OFFSET(addr)));
+ DBUG_PRINT("enter", ("File: %u Offset: %u(0x%x)",
+ file_no,
+ (uint) LSN_OFFSET(addr),
+ (uint) LSN_OFFSET(addr)));
/* it is really page address */
DBUG_ASSERT(LSN_OFFSET(addr) % TRANSLOG_PAGE_SIZE == 0);
@@ -2998,7 +2998,7 @@ static uchar *translog_get_page(TRANSLOG_VALIDATOR_DATA *data, uchar *buffer,
restart:
in_buffers= translog_only_in_buffers();
- DBUG_PRINT("info", ("in_buffers: (%lu,0x%lx)",
+ DBUG_PRINT("info", ("in_buffers: " LSN_FMT,
LSN_IN_PARTS(in_buffers)));
if (in_buffers != LSN_IMPOSSIBLE &&
cmp_translog_addr(addr, in_buffers) >= 0)
@@ -3168,9 +3168,9 @@ restart:
PAGECACHE_LOCK_READ :
PAGECACHE_LOCK_LEFT_UNLOCKED),
direct_link);
- DBUG_PRINT("info", ("Direct link is assigned to : 0x%lx * 0x%lx",
- (ulong) direct_link,
- (ulong)(direct_link ? *direct_link : NULL)));
+ DBUG_PRINT("info", ("Direct link is assigned to : %p * %p",
+ direct_link,
+ (direct_link ? *direct_link : NULL)));
data->was_recovered= file->was_recovered;
DBUG_RETURN(buffer);
}
@@ -3186,8 +3186,8 @@ restart:
static void translog_free_link(PAGECACHE_BLOCK_LINK *direct_link)
{
DBUG_ENTER("translog_free_link");
- DBUG_PRINT("info", ("Direct link: 0x%lx",
- (ulong) direct_link));
+ DBUG_PRINT("info", ("Direct link: %p",
+ direct_link));
if (direct_link)
pagecache_unlock_by_link(log_descriptor.pagecache, direct_link,
PAGECACHE_LOCK_READ_UNLOCK, PAGECACHE_UNPIN,
@@ -3380,8 +3380,8 @@ static my_bool translog_truncate_log(TRANSLOG_ADDRESS addr)
uchar page_buff[TRANSLOG_PAGE_SIZE];
DBUG_ENTER("translog_truncate_log");
/* TODO: write warning to the client */
- DBUG_PRINT("warning", ("removing all records from (%lu,0x%lx) "
- "till (%lu,0x%lx)",
+ DBUG_PRINT("warning", ("removing all records from " LSN_FMT " "
+ "till " LSN_FMT,
LSN_IN_PARTS(addr),
LSN_IN_PARTS(log_descriptor.horizon)));
DBUG_ASSERT(cmp_translog_addr(addr, log_descriptor.horizon) < 0);
@@ -3680,8 +3680,8 @@ my_bool translog_init_with_table(const char *directory,
{
if (translog_buffer_init(log_descriptor.buffers + i, i))
goto err;
- DBUG_PRINT("info", ("translog_buffer buffer #%u: 0x%lx",
- i, (ulong) log_descriptor.buffers + i));
+ DBUG_PRINT("info", ("translog_buffer buffer #%u:%p",
+ i, log_descriptor.buffers + i));
}
/*
@@ -3929,9 +3929,9 @@ my_bool translog_init_with_table(const char *directory,
log_descriptor.horizon= LSN_REPLACE_OFFSET(log_descriptor.horizon,
(chunk_offset +
LSN_OFFSET(last_valid_page)));
- DBUG_PRINT("info", ("Move Page #%u: 0x%lx chaser: %d Size: %lu (%lu)",
+ DBUG_PRINT("info", ("Move Page #%u: %p chaser: %d Size: %lu (%lu)",
(uint) log_descriptor.bc.buffer_no,
- (ulong) log_descriptor.bc.buffer,
+ log_descriptor.bc.buffer,
log_descriptor.bc.chaser,
(ulong) log_descriptor.bc.buffer->size,
(ulong) (log_descriptor.bc.ptr - log_descriptor.bc.
@@ -4095,7 +4095,7 @@ my_bool translog_init_with_table(const char *directory,
There is no harm in leaving it "as-is".
*/
log_descriptor.previous_flush_horizon= log_descriptor.horizon;
- DBUG_PRINT("info", ("previous_flush_horizon: (%lu,0x%lx)",
+ DBUG_PRINT("info", ("previous_flush_horizon: " LSN_FMT,
LSN_IN_PARTS(log_descriptor.
previous_flush_horizon)));
DBUG_RETURN(0);
@@ -4123,7 +4123,7 @@ my_bool translog_init_with_table(const char *directory,
translog_size_t rec_len;
int len;
uchar buffer[1];
- DBUG_PRINT("info", ("going to check the last found record (%lu,0x%lx)",
+ DBUG_PRINT("info", ("going to check the last found record " LSN_FMT,
LSN_IN_PARTS(last_lsn)));
len=
@@ -4132,7 +4132,7 @@ my_bool translog_init_with_table(const char *directory,
len == RECHEADER_READ_EOF))
{
DBUG_PRINT("error", ("unexpected end of log or record during "
- "reading record header: (%lu,0x%lx) len: %d",
+ "reading record header: " LSN_FMT " len: %d",
LSN_IN_PARTS(last_lsn), len));
if (readonly)
log_descriptor.log_start= log_descriptor.horizon= last_lsn;
@@ -4156,7 +4156,7 @@ my_bool translog_init_with_table(const char *directory,
if (rec_len != 1)
{
DBUG_PRINT("error", ("unexpected end of log or record during "
- "reading record body: (%lu,0x%lx) len: %d",
+ "reading record body: " LSN_FMT " len: %d",
LSN_IN_PARTS(rec.lsn),
len));
if (readonly)
@@ -4174,7 +4174,7 @@ my_bool translog_init_with_table(const char *directory,
}
}
log_descriptor.previous_flush_horizon= log_descriptor.horizon;
- DBUG_PRINT("info", ("previous_flush_horizon: (%lu,0x%lx)",
+ DBUG_PRINT("info", ("previous_flush_horizon: " LSN_FMT,
LSN_IN_PARTS(log_descriptor.previous_flush_horizon)));
DBUG_RETURN(0);
err:
@@ -4193,8 +4193,8 @@ static void translog_buffer_destroy(struct st_translog_buffer *buffer)
{
DBUG_ENTER("translog_buffer_destroy");
DBUG_PRINT("enter",
- ("Buffer #%u: 0x%lx file: %d offset: (%lu,0x%lx) size: %lu",
- (uint) buffer->buffer_no, (ulong) buffer,
+ ("Buffer #%u: %p file: %d offset: " LSN_FMT " size: %lu",
+ (uint) buffer->buffer_no, buffer,
(buffer->file ? buffer->file->handler.file : -1),
LSN_IN_PARTS(buffer->offset),
(ulong) buffer->size));
@@ -4212,7 +4212,7 @@ static void translog_buffer_destroy(struct st_translog_buffer *buffer)
translog_buffer_flush(buffer);
translog_buffer_unlock(buffer);
}
- DBUG_PRINT("info", ("Destroy mutex: 0x%lx", (ulong) &buffer->mutex));
+ DBUG_PRINT("info", ("Destroy mutex: %p", &buffer->mutex));
mysql_mutex_destroy(&buffer->mutex);
mysql_cond_destroy(&buffer->waiting_filling_buffer);
DBUG_VOID_RETURN;
@@ -4322,15 +4322,15 @@ static my_bool translog_page_next(TRANSLOG_ADDRESS *horizon,
TRANSLOG_PAGE_SIZE)))
DBUG_RETURN(1);
*prev_buffer= buffer;
- DBUG_PRINT("info", ("Buffer #%u (0x%lu): have to be flushed",
- (uint) buffer->buffer_no, (ulong) buffer));
+ DBUG_PRINT("info", ("Buffer #%u (%p): have to be flushed",
+ (uint) buffer->buffer_no, buffer));
}
else
{
- DBUG_PRINT("info", ("Use the same buffer #%u (0x%lu): "
+ DBUG_PRINT("info", ("Use the same buffer #%u (%p): "
"Buffer Size: %lu (%lu)",
(uint) buffer->buffer_no,
- (ulong) buffer,
+ buffer,
(ulong) cursor->buffer->size,
(ulong) (cursor->ptr - cursor->buffer->buffer)));
translog_finish_page(horizon, cursor);
@@ -4374,9 +4374,9 @@ static my_bool translog_write_data_on_page(TRANSLOG_ADDRESS *horizon,
cursor->current_page_fill+= length;
if (!cursor->chaser)
cursor->buffer->size+= length;
- DBUG_PRINT("info", ("Write data buffer #%u: 0x%lx "
+ DBUG_PRINT("info", ("Write data buffer #%u: %p "
"chaser: %d Size: %lu (%lu)",
- (uint) cursor->buffer->buffer_no, (ulong) cursor->buffer,
+ (uint) cursor->buffer->buffer_no, cursor->buffer,
cursor->chaser, (ulong) cursor->buffer->size,
(ulong) (cursor->ptr - cursor->buffer->buffer)));
translog_check_cursor(cursor);
@@ -4429,9 +4429,9 @@ static my_bool translog_write_parts_on_page(TRANSLOG_ADDRESS *horizon,
DBUG_ASSERT(cur < parts->elements);
part= parts->parts + cur;
buff= part->str;
- DBUG_PRINT("info", ("Part: %u Length: %lu left: %lu buff: 0x%lx",
+ DBUG_PRINT("info", ("Part: %u Length: %lu left: %lu buff: %p",
(uint) (cur + 1), (ulong) part->length, (ulong) left,
- (ulong) buff));
+ buff));
if (part->length > left)
{
@@ -4448,8 +4448,8 @@ static my_bool translog_write_parts_on_page(TRANSLOG_ADDRESS *horizon,
cur++;
DBUG_PRINT("info", ("moved to next part (len: %lu)", (ulong) len));
}
- DBUG_PRINT("info", ("copy: 0x%lx <- 0x%lx %u",
- (ulong) cursor->ptr, (ulong)buff, (uint)len));
+ DBUG_PRINT("info", ("copy: %p <- %p %u",
+ cursor->ptr, buff, len));
if (likely(len))
{
memcpy(cursor->ptr, buff, len);
@@ -4458,9 +4458,9 @@ static my_bool translog_write_parts_on_page(TRANSLOG_ADDRESS *horizon,
}
} while (left);
- DBUG_PRINT("info", ("Horizon: (%lu,0x%lx) Length %lu(0x%lx)",
+ DBUG_PRINT("info", ("Horizon: " LSN_FMT " Length %u(0x%x)",
LSN_IN_PARTS(*horizon),
- (ulong) length, (ulong) length));
+ length, length));
parts->current= cur;
(*horizon)+= length; /* offset increasing */
cursor->current_page_fill+= length;
@@ -4470,14 +4470,14 @@ static my_bool translog_write_parts_on_page(TRANSLOG_ADDRESS *horizon,
We do not not updating parts->total_record_length here because it is
need only before writing record to have total length
*/
- DBUG_PRINT("info", ("Write parts buffer #%u: 0x%lx "
+ DBUG_PRINT("info", ("Write parts buffer #%u: %p "
"chaser: %d Size: %lu (%lu) "
- "Horizon: (%lu,0x%lx) buff offset: 0x%lx",
- (uint) cursor->buffer->buffer_no, (ulong) cursor->buffer,
+ "Horizon: " LSN_FMT " buff offset: 0x%x",
+ (uint) cursor->buffer->buffer_no, cursor->buffer,
cursor->chaser, (ulong) cursor->buffer->size,
(ulong) (cursor->ptr - cursor->buffer->buffer),
LSN_IN_PARTS(*horizon),
- (ulong) (LSN_OFFSET(cursor->buffer->offset) +
+ (uint) (LSN_OFFSET(cursor->buffer->offset) +
cursor->buffer->size)));
translog_check_cursor(cursor);
@@ -4535,8 +4535,8 @@ translog_buffer_increase_writers(struct st_translog_buffer *buffer)
DBUG_ENTER("translog_buffer_increase_writers");
translog_buffer_lock_assert_owner(buffer);
buffer->copy_to_buffer_in_progress++;
- DBUG_PRINT("info", ("copy_to_buffer_in_progress. Buffer #%u 0x%lx progress: %d",
- (uint) buffer->buffer_no, (ulong) buffer,
+ DBUG_PRINT("info", ("copy_to_buffer_in_progress. Buffer #%u %p progress: %d",
+ (uint) buffer->buffer_no, buffer,
buffer->copy_to_buffer_in_progress));
DBUG_VOID_RETURN;
}
@@ -4556,8 +4556,8 @@ static void translog_buffer_decrease_writers(struct st_translog_buffer *buffer)
translog_buffer_lock_assert_owner(buffer);
buffer->copy_to_buffer_in_progress--;
DBUG_PRINT("info",
- ("copy_to_buffer_in_progress. Buffer #%u 0x%lx progress: %d",
- (uint) buffer->buffer_no, (ulong) buffer,
+ ("copy_to_buffer_in_progress. Buffer #%u %p progress: %d",
+ (uint) buffer->buffer_no, buffer,
buffer->copy_to_buffer_in_progress));
if (buffer->copy_to_buffer_in_progress == 0)
mysql_cond_broadcast(&buffer->waiting_filling_buffer);
@@ -4701,7 +4701,7 @@ static my_bool translog_advance_pointer(int pages, uint16 last_page_data)
pages * TRANSLOG_PAGE_SIZE + last_page_offset);
translog_size_t buffer_end_offset, file_end_offset, min_offset;
DBUG_ENTER("translog_advance_pointer");
- DBUG_PRINT("enter", ("Pointer: (%lu, 0x%lx) + %u + %u pages + %u + %u",
+ DBUG_PRINT("enter", ("Pointer: " LSN_FMT " + %u + %u pages + %u + %u",
LSN_IN_PARTS(log_descriptor.horizon),
(uint) (TRANSLOG_PAGE_SIZE -
log_descriptor.bc.current_page_fill),
@@ -4751,20 +4751,20 @@ static my_bool translog_advance_pointer(int pages, uint16 last_page_data)
file_end_offset= (TRANSLOG_PAGE_SIZE -
log_descriptor.bc.current_page_fill);
}
- DBUG_PRINT("info", ("offset: %lu buffer_end_offs: %lu, "
- "file_end_offs: %lu",
- (ulong) offset, (ulong) buffer_end_offset,
- (ulong) file_end_offset));
- DBUG_PRINT("info", ("Buff #%u %u (0x%lx) offset 0x%lx + size 0x%lx = "
- "0x%lx (0x%lx)",
- (uint) log_descriptor.bc.buffer->buffer_no,
- (uint) log_descriptor.bc.buffer_no,
- (ulong) log_descriptor.bc.buffer,
- (ulong) LSN_OFFSET(log_descriptor.bc.buffer->offset),
- (ulong) log_descriptor.bc.buffer->size,
- (ulong) (LSN_OFFSET(log_descriptor.bc.buffer->offset) +
+ DBUG_PRINT("info", ("offset: %u buffer_end_offs: %u, "
+ "file_end_offs: %u",
+ offset, buffer_end_offset,
+ file_end_offset));
+ DBUG_PRINT("info", ("Buff #%u %u (%p) offset 0x%x + size 0x%x = "
+ "0x%x (0x%x)",
+ log_descriptor.bc.buffer->buffer_no,
+ log_descriptor.bc.buffer_no,
+ log_descriptor.bc.buffer,
+ (uint) LSN_OFFSET(log_descriptor.bc.buffer->offset),
+ log_descriptor.bc.buffer->size,
+ (uint) (LSN_OFFSET(log_descriptor.bc.buffer->offset) +
log_descriptor.bc.buffer->size),
- (ulong) LSN_OFFSET(log_descriptor.horizon)));
+ (uint) LSN_OFFSET(log_descriptor.horizon)));
DBUG_ASSERT(LSN_OFFSET(log_descriptor.bc.buffer->offset) +
log_descriptor.bc.buffer->size ==
LSN_OFFSET(log_descriptor.horizon));
@@ -4795,9 +4795,9 @@ static my_bool translog_advance_pointer(int pages, uint16 last_page_data)
/* TODO: check is it ptr or size enough */
log_descriptor.bc.buffer->size+= min_offset;
log_descriptor.bc.ptr+= min_offset;
- DBUG_PRINT("info", ("NewP buffer #%u: 0x%lx chaser: %d Size: %lu (%lu)",
+ DBUG_PRINT("info", ("NewP buffer #%u: %p chaser: %d Size: %lu (%lu)",
(uint) log_descriptor.bc.buffer->buffer_no,
- (ulong) log_descriptor.bc.buffer,
+ log_descriptor.bc.buffer,
log_descriptor.bc.chaser,
(ulong) log_descriptor.bc.buffer->size,
(ulong) (log_descriptor.bc.ptr -log_descriptor.bc.
@@ -4841,10 +4841,10 @@ end:
translog_buffer_increase_writers(log_descriptor.bc.buffer);
log_descriptor.horizon+= offset; /* offset increasing */
log_descriptor.bc.current_page_fill= last_page_offset;
- DBUG_PRINT("info", ("NewP buffer #%u: 0x%lx chaser: %d Size: %lu (%lu) "
+ DBUG_PRINT("info", ("NewP buffer #%u: %p chaser: %d Size: %lu (%lu) "
"offset: %u last page: %u",
(uint) log_descriptor.bc.buffer->buffer_no,
- (ulong) log_descriptor.bc.buffer,
+ log_descriptor.bc.buffer,
log_descriptor.bc.chaser,
(ulong) log_descriptor.bc.buffer->size,
(ulong) (log_descriptor.bc.ptr -
@@ -4852,7 +4852,7 @@ end:
buffer), (uint) offset,
(uint) last_page_offset));
DBUG_PRINT("info",
- ("pointer moved to: (%lu, 0x%lx)",
+ ("pointer moved to: " LSN_FMT,
LSN_IN_PARTS(log_descriptor.horizon)));
translog_check_cursor(&log_descriptor.bc);
log_descriptor.bc.protected= 0;
@@ -4939,7 +4939,7 @@ static inline void set_lsn(LSN *lsn, LSN value)
*lsn= value;
/* we generate LSN so something is not flushed in log */
log_descriptor.is_everything_flushed= 0;
- DBUG_PRINT("info", ("new LSN appeared: (%lu,0x%lx)", LSN_IN_PARTS(value)));
+ DBUG_PRINT("info", ("new LSN appeared: " LSN_FMT, LSN_IN_PARTS(value)));
DBUG_VOID_RETURN;
}
@@ -5030,9 +5030,9 @@ translog_write_variable_record_1group(LSN *lsn,
rc|= translog_advance_pointer((int)(full_pages + additional_chunk3_page),
(record_rest ? record_rest + 3 : 0));
log_descriptor.bc.buffer->last_lsn= *lsn;
- DBUG_PRINT("info", ("last_lsn set to (%lu,0x%lx) buffer: 0x%lx",
+ DBUG_PRINT("info", ("last_lsn set to " LSN_FMT " buffer: %p",
LSN_IN_PARTS(log_descriptor.bc.buffer->last_lsn),
- (ulong) log_descriptor.bc.buffer));
+ log_descriptor.bc.buffer));
translog_unlock();
@@ -5055,7 +5055,7 @@ translog_write_variable_record_1group(LSN *lsn,
/* fill the pages */
translog_write_parts_on_page(&horizon, &cursor, first_page, parts);
- DBUG_PRINT("info", ("absolute horizon: (%lu,0x%lx) local: (%lu,0x%lx)",
+ DBUG_PRINT("info", ("absolute horizon: " LSN_FMT " local: " LSN_FMT,
LSN_IN_PARTS(log_descriptor.horizon),
LSN_IN_PARTS(horizon)));
@@ -5064,7 +5064,7 @@ translog_write_variable_record_1group(LSN *lsn,
if (translog_write_variable_record_chunk2_page(parts, &horizon, &cursor))
DBUG_RETURN(1);
- DBUG_PRINT("info", ("absolute horizon: (%lu,0x%lx) local: (%lu,0x%lx)",
+ DBUG_PRINT("info", ("absolute horizon: " LSN_FMT " local: " LSN_FMT,
LSN_IN_PARTS(log_descriptor.horizon),
LSN_IN_PARTS(horizon)));
}
@@ -5076,7 +5076,7 @@ translog_write_variable_record_1group(LSN *lsn,
page_capacity_chunk_2 - 2,
&horizon, &cursor))
DBUG_RETURN(1);
- DBUG_PRINT("info", ("absolute horizon: (%lu,0x%lx) local: (%lu,0x%lx)",
+ DBUG_PRINT("info", ("absolute horizon: " LSN_FMT " local: " LSN_FMT,
LSN_IN_PARTS(log_descriptor.horizon),
LSN_IN_PARTS(horizon)));
DBUG_ASSERT(cursor.current_page_fill == TRANSLOG_PAGE_SIZE);
@@ -5086,7 +5086,7 @@ translog_write_variable_record_1group(LSN *lsn,
record_rest,
&horizon, &cursor))
DBUG_RETURN(1);
- DBUG_PRINT("info", ("absolute horizon: (%lu,0x%lx) local: (%lu,0x%lx)",
+ DBUG_PRINT("info", ("absolute horizon: " LSN_FMT " local: " LSN_FMT,
(ulong) LSN_FILE_NO(log_descriptor.horizon),
(ulong) LSN_OFFSET(log_descriptor.horizon),
(ulong) LSN_FILE_NO(horizon),
@@ -5156,9 +5156,9 @@ translog_write_variable_record_1chunk(LSN *lsn,
&log_descriptor.bc,
parts->total_record_length, parts);
log_descriptor.bc.buffer->last_lsn= *lsn;
- DBUG_PRINT("info", ("last_lsn set to (%lu,0x%lx) buffer: 0x%lx",
+ DBUG_PRINT("info", ("last_lsn set to " LSN_FMT " buffer: %p",
LSN_IN_PARTS(log_descriptor.bc.buffer->last_lsn),
- (ulong) log_descriptor.bc.buffer));
+ log_descriptor.bc.buffer));
translog_unlock();
/*
@@ -5202,9 +5202,9 @@ static uchar *translog_put_LSN_diff(LSN base_lsn, LSN lsn, uchar *dst)
{
uint64 diff;
DBUG_ENTER("translog_put_LSN_diff");
- DBUG_PRINT("enter", ("Base: (%lu,0x%lx) val: (%lu,0x%lx) dst: 0x%lx",
+ DBUG_PRINT("enter", ("Base: " LSN_FMT " val: " LSN_FMT " dst:%p",
LSN_IN_PARTS(base_lsn), LSN_IN_PARTS(lsn),
- (ulong) dst));
+ dst));
DBUG_ASSERT(base_lsn > lsn);
diff= base_lsn - lsn;
DBUG_PRINT("info", ("Diff: 0x%llx", (ulonglong) diff));
@@ -5248,7 +5248,7 @@ static uchar *translog_put_LSN_diff(LSN base_lsn, LSN lsn, uchar *dst)
dst[1]= 1;
lsn_store(dst + 2, lsn);
}
- DBUG_PRINT("info", ("new dst: 0x%lx", (ulong) dst));
+ DBUG_PRINT("info", ("new dst:%p", dst));
DBUG_RETURN(dst);
}
@@ -5287,8 +5287,8 @@ static uchar *translog_get_LSN_from_diff(LSN base_lsn, uchar *src, uchar *dst)
uint32 file_no, rec_offset;
uint8 code;
DBUG_ENTER("translog_get_LSN_from_diff");
- DBUG_PRINT("enter", ("Base: (%lu,0x%lx) src: 0x%lx dst 0x%lx",
- LSN_IN_PARTS(base_lsn), (ulong) src, (ulong) dst));
+ DBUG_PRINT("enter", ("Base: " LSN_FMT " src:%p dst %p",
+ LSN_IN_PARTS(base_lsn), src, dst));
first_byte= *((uint8*) src);
code= first_byte >> 6; /* Length is in 2 most significant bits */
first_byte&= 0x3F;
@@ -5305,8 +5305,8 @@ static uchar *translog_get_LSN_from_diff(LSN base_lsn, uchar *src, uchar *dst)
in real life)
*/
memcpy(dst, src + 1, LSN_STORE_SIZE);
- DBUG_PRINT("info", ("Special case of full LSN, new src: 0x%lx",
- (ulong) (src + 1 + LSN_STORE_SIZE)));
+ DBUG_PRINT("info", ("Special case of full LSN, new src:%p",
+ src + 1 + LSN_STORE_SIZE));
DBUG_RETURN(src + 1 + LSN_STORE_SIZE);
}
rec_offset= LSN_OFFSET(base_lsn) - ((first_byte << 8) + *((uint8*)src));
@@ -5341,7 +5341,7 @@ static uchar *translog_get_LSN_from_diff(LSN base_lsn, uchar *src, uchar *dst)
lsn= MAKE_LSN(file_no, rec_offset);
src+= code + 1;
lsn_store(dst, lsn);
- DBUG_PRINT("info", ("new src: 0x%lx", (ulong) src));
+ DBUG_PRINT("info", ("new src:%p", src));
DBUG_RETURN(src);
}
@@ -5375,7 +5375,7 @@ static void translog_relative_LSN_encode(struct st_translog_parts *parts,
{
uint copied= part->length;
LEX_CUSTRING *next_part;
- DBUG_PRINT("info", ("Using buffer: 0x%lx", (ulong) compressed_LSNs));
+ DBUG_PRINT("info", ("Using buffer:%p", compressed_LSNs));
memcpy(buffer, part->str, part->length);
next_part= parts->parts + parts->current + 1;
do
@@ -5592,7 +5592,7 @@ translog_write_variable_record_mgroup(LSN *lsn,
translog_write_data_on_page(&horizon, &cursor, 1, chunk2_header);
translog_write_parts_on_page(&horizon, &cursor, first_page - 1, parts);
- DBUG_PRINT("info", ("absolute horizon: (%lu,0x%lx) local: (%lu,0x%lx) "
+ DBUG_PRINT("info", ("absolute horizon: " LSN_FMT " local: " LSN_FMT " "
"Left %lu",
LSN_IN_PARTS(log_descriptor.horizon),
LSN_IN_PARTS(horizon),
@@ -5604,8 +5604,8 @@ translog_write_variable_record_mgroup(LSN *lsn,
if (translog_write_variable_record_chunk2_page(parts, &horizon, &cursor))
goto err;
- DBUG_PRINT("info", ("absolute horizon: (%lu,0x%lx) "
- "local: (%lu,0x%lx) "
+ DBUG_PRINT("info", ("absolute horizon: " LSN_FMT " "
+ "local: " LSN_FMT " "
"Left: %lu",
LSN_IN_PARTS(log_descriptor.horizon),
LSN_IN_PARTS(horizon),
@@ -5763,7 +5763,7 @@ translog_write_variable_record_mgroup(LSN *lsn,
DBUG_PRINT("info", ("chunk 2 to finish first page"));
translog_write_data_on_page(&horizon, &cursor, 1, chunk2_header);
translog_write_parts_on_page(&horizon, &cursor, first_page - 1, parts);
- DBUG_PRINT("info", ("absolute horizon: (%lu,0x%lx) local: (%lu,0x%lx) "
+ DBUG_PRINT("info", ("absolute horizon: " LSN_FMT " local: " LSN_FMT " "
"Left: %lu",
LSN_IN_PARTS(log_descriptor.horizon),
LSN_IN_PARTS(horizon),
@@ -5780,7 +5780,7 @@ translog_write_variable_record_mgroup(LSN *lsn,
int2store(chunk3_header + 1, chunk3_size);
translog_write_data_on_page(&horizon, &cursor, 3, chunk3_header);
translog_write_parts_on_page(&horizon, &cursor, chunk3_size, parts);
- DBUG_PRINT("info", ("absolute horizon: (%lu,0x%lx) local: (%lu,0x%lx) "
+ DBUG_PRINT("info", ("absolute horizon: " LSN_FMT " local: " LSN_FMT " "
"Left: %lu",
LSN_IN_PARTS(log_descriptor.horizon),
LSN_IN_PARTS(horizon),
@@ -5798,7 +5798,7 @@ translog_write_variable_record_mgroup(LSN *lsn,
if (translog_write_variable_record_chunk2_page(parts, &horizon, &cursor))
goto err;
- DBUG_PRINT("info", ("absolute horizon: (%lu,0x%lx) local: (%lu,0x%lx) "
+ DBUG_PRINT("info", ("absolute horizon: " LSN_FMT " local: " LSN_FMT " "
"Left: %lu",
LSN_IN_PARTS(log_descriptor.horizon),
LSN_IN_PARTS(horizon),
@@ -5812,7 +5812,7 @@ translog_write_variable_record_mgroup(LSN *lsn,
chunk3_size,
&horizon, &cursor))
goto err;
- DBUG_PRINT("info", ("absolute horizon: (%lu,0x%lx) local: (%lu,0x%lx)",
+ DBUG_PRINT("info", ("absolute horizon: " LSN_FMT " local: " LSN_FMT,
LSN_IN_PARTS(log_descriptor.horizon),
LSN_IN_PARTS(horizon)));
@@ -5847,9 +5847,9 @@ translog_write_variable_record_mgroup(LSN *lsn,
translog_lock();
set_lsn(lsn, horizon);
buffer_of_last_lsn->last_lsn= *lsn;
- DBUG_PRINT("info", ("last_lsn set to (%lu,0x%lx) buffer: 0x%lx",
+ DBUG_PRINT("info", ("last_lsn set to " LSN_FMT " buffer: %p",
LSN_IN_PARTS(buffer_of_last_lsn->last_lsn),
- (ulong) buffer_of_last_lsn));
+ buffer_of_last_lsn));
if (log_record_type_descriptor[type].inwrite_hook &&
(*log_record_type_descriptor[type].inwrite_hook) (type, trn,
tbl_info,
@@ -5977,7 +5977,7 @@ static my_bool translog_write_variable_record(LSN *lsn,
DBUG_ENTER("translog_write_variable_record");
translog_lock();
- DBUG_PRINT("info", ("horizon: (%lu,0x%lx)",
+ DBUG_PRINT("info", ("horizon: " LSN_FMT,
LSN_IN_PARTS(log_descriptor.horizon)));
page_rest= TRANSLOG_PAGE_SIZE - log_descriptor.bc.current_page_fill;
DBUG_PRINT("info", ("header length: %u page_rest: %u",
@@ -6093,7 +6093,7 @@ static my_bool translog_write_fixed_record(LSN *lsn,
log_record_type_descriptor[type].fixed_length));
translog_lock();
- DBUG_PRINT("info", ("horizon: (%lu,0x%lx)",
+ DBUG_PRINT("info", ("horizon: " LSN_FMT,
LSN_IN_PARTS(log_descriptor.horizon)));
DBUG_ASSERT(log_descriptor.bc.current_page_fill <= TRANSLOG_PAGE_SIZE);
@@ -6157,9 +6157,9 @@ static my_bool translog_write_fixed_record(LSN *lsn,
parts->total_record_length, parts);
log_descriptor.bc.buffer->last_lsn= *lsn;
- DBUG_PRINT("info", ("last_lsn set to (%lu,0x%lx) buffer: 0x%lx",
+ DBUG_PRINT("info", ("last_lsn set to " LSN_FMT " buffer: %p",
LSN_IN_PARTS(log_descriptor.bc.buffer->last_lsn),
- (ulong) log_descriptor.bc.buffer));
+ log_descriptor.bc.buffer));
err:
translog_unlock();
@@ -6349,7 +6349,7 @@ my_bool translog_write_record(LSN *lsn,
}
}
- DBUG_PRINT("info", ("LSN: (%lu,0x%lx)", LSN_IN_PARTS(*lsn)));
+ DBUG_PRINT("info", ("LSN: " LSN_FMT, LSN_IN_PARTS(*lsn)));
DBUG_RETURN(rc);
}
@@ -6564,8 +6564,8 @@ my_bool translog_scanner_init(LSN lsn,
my_bool use_direct)
{
DBUG_ENTER("translog_scanner_init");
- DBUG_PRINT("enter", ("Scanner: 0x%lx LSN: (%lu,0x%lx)",
- (ulong) scanner, LSN_IN_PARTS(lsn)));
+ DBUG_PRINT("enter", ("Scanner: %p LSN: " LSN_FMT,
+ scanner, LSN_IN_PARTS(lsn)));
DBUG_ASSERT(translog_status == TRANSLOG_OK ||
translog_status == TRANSLOG_READONLY);
@@ -6576,7 +6576,7 @@ my_bool translog_scanner_init(LSN lsn,
scanner->direct_link= NULL;
scanner->horizon= translog_get_horizon();
- DBUG_PRINT("info", ("horizon: (%lu,0x%lx)", LSN_IN_PARTS(scanner->horizon)));
+ DBUG_PRINT("info", ("horizon: " LSN_FMT, LSN_IN_PARTS(scanner->horizon)));
/* lsn < horizon */
DBUG_ASSERT(lsn <= scanner->horizon);
@@ -6602,7 +6602,7 @@ my_bool translog_scanner_init(LSN lsn,
void translog_destroy_scanner(TRANSLOG_SCANNER_DATA *scanner)
{
DBUG_ENTER("translog_destroy_scanner");
- DBUG_PRINT("enter", ("Scanner: 0x%lx", (ulong)scanner));
+ DBUG_PRINT("enter", ("Scanner: %p", scanner));
translog_free_link(scanner->direct_link);
DBUG_VOID_RETURN;
}
@@ -6624,7 +6624,7 @@ static my_bool translog_scanner_eol(TRANSLOG_SCANNER_DATA *scanner)
{
DBUG_ENTER("translog_scanner_eol");
DBUG_PRINT("enter",
- ("Horizon: (%lu, 0x%lx) Current: (%lu, 0x%lx+0x%x=0x%lx)",
+ ("Horizon: " LSN_FMT " Current: (%lu, 0x%lx+0x%x=0x%lx)",
LSN_IN_PARTS(scanner->horizon),
LSN_IN_PARTS(scanner->page_addr),
(uint) scanner->page_offset,
@@ -6733,7 +6733,7 @@ translog_get_next_chunk(TRANSLOG_SCANNER_DATA *scanner)
translog_free_link(scanner->direct_link);
if (translog_scanner_eof(scanner))
{
- DBUG_PRINT("info", ("horizon: (%lu,0x%lx) pageaddr: (%lu,0x%lx)",
+ DBUG_PRINT("info", ("horizon: " LSN_FMT " pageaddr: " LSN_FMT,
LSN_IN_PARTS(scanner->horizon),
LSN_IN_PARTS(scanner->page_addr)));
/* if it is log end it have to be caught before */
@@ -6852,7 +6852,7 @@ translog_variable_length_header(uchar *page, translog_size_t page_offset,
DBUG_ASSERT(curr < buff->groups_no);
buff->groups[curr].addr= lsn_korr(src + i * (7 + 1));
buff->groups[curr].num= src[i * (7 + 1) + 7];
- DBUG_PRINT("info", ("group #%u (%lu,0x%lx) chunks: %u",
+ DBUG_PRINT("info", ("group #%u " LSN_FMT " chunks: %u",
curr,
LSN_IN_PARTS(buff->groups[curr].addr),
(uint) buff->groups[curr].num));
@@ -6874,7 +6874,7 @@ translog_variable_length_header(uchar *page, translog_size_t page_offset,
buff->chunk0_data_addr+= (header_to_skip + read_length * (7 + 1));
}
buff->chunk0_data_len= chunk_len - 2 - read_length * (7 + 1);
- DBUG_PRINT("info", ("Data address: (%lu,0x%lx) len: %u",
+ DBUG_PRINT("info", ("Data address: " LSN_FMT " len: %u",
LSN_IN_PARTS(buff->chunk0_data_addr),
buff->chunk0_data_len));
break;
@@ -6997,7 +6997,7 @@ int translog_read_record_header_from_buffer(uchar *page,
translog_status == TRANSLOG_READONLY);
buff->type= (page[page_offset] & TRANSLOG_REC_TYPE);
buff->short_trid= uint2korr(page + page_offset + 1);
- DBUG_PRINT("info", ("Type %u, Short TrID %u, LSN (%lu,0x%lx)",
+ DBUG_PRINT("info", ("Type %u, Short TrID %u, LSN " LSN_FMT,
(uint) buff->type, (uint)buff->short_trid,
LSN_IN_PARTS(buff->lsn)));
/* Read required bytes from the header and call hook */
@@ -7046,7 +7046,7 @@ int translog_read_record_header(LSN lsn, TRANSLOG_HEADER_BUFFER *buff)
TRANSLOG_ADDRESS addr;
TRANSLOG_VALIDATOR_DATA data;
DBUG_ENTER("translog_read_record_header");
- DBUG_PRINT("enter", ("LSN: (%lu,0x%lx)", LSN_IN_PARTS(lsn)));
+ DBUG_PRINT("enter", ("LSN: " LSN_FMT, LSN_IN_PARTS(lsn)));
DBUG_ASSERT(LSN_OFFSET(lsn) % TRANSLOG_PAGE_SIZE != 0);
DBUG_ASSERT(translog_status == TRANSLOG_OK ||
translog_status == TRANSLOG_READONLY);
@@ -7091,8 +7091,8 @@ int translog_read_record_header_scan(TRANSLOG_SCANNER_DATA *scanner,
{
translog_size_t res;
DBUG_ENTER("translog_read_record_header_scan");
- DBUG_PRINT("enter", ("Scanner: Cur: (%lu,0x%lx) Hrz: (%lu,0x%lx) "
- "Lst: (%lu,0x%lx) Offset: %u(%x) fixed %d",
+ DBUG_PRINT("enter", ("Scanner: Cur: " LSN_FMT " Hrz: " LSN_FMT " "
+ "Lst: " LSN_FMT " Offset: %u(%x) fixed %d",
LSN_IN_PARTS(scanner->page_addr),
LSN_IN_PARTS(scanner->horizon),
LSN_IN_PARTS(scanner->last_file_page),
@@ -7137,9 +7137,9 @@ int translog_read_next_record_header(TRANSLOG_SCANNER_DATA *scanner,
DBUG_ENTER("translog_read_next_record_header");
buff->groups_no= 0; /* to be sure that we will free it right */
- DBUG_PRINT("enter", ("scanner: 0x%lx", (ulong) scanner));
- DBUG_PRINT("info", ("Scanner: Cur: (%lu,0x%lx) Hrz: (%lu,0x%lx) "
- "Lst: (%lu,0x%lx) Offset: %u(%x) fixed: %d",
+ DBUG_PRINT("enter", ("scanner: %p", scanner));
+ DBUG_PRINT("info", ("Scanner: Cur: " LSN_FMT " Hrz: " LSN_FMT " "
+ "Lst: " LSN_FMT " Offset: %u(%x) fixed: %d",
LSN_IN_PARTS(scanner->page_addr),
LSN_IN_PARTS(scanner->horizon),
LSN_IN_PARTS(scanner->last_file_page),
@@ -7159,7 +7159,7 @@ int translog_read_next_record_header(TRANSLOG_SCANNER_DATA *scanner,
buff->lsn= LSN_IMPOSSIBLE;
DBUG_RETURN(RECHEADER_READ_EOF);
}
- DBUG_PRINT("info", ("Page: (%lu,0x%lx) offset: %lu byte: %x",
+ DBUG_PRINT("info", ("Page: " LSN_FMT " offset: %lu byte: %x",
LSN_IN_PARTS(scanner->page_addr),
(ulong) scanner->page_offset,
(uint) scanner->page[scanner->page_offset]));
@@ -7368,8 +7368,8 @@ translog_size_t translog_read_record(LSN lsn,
DBUG_RETURN(0);
}
DBUG_PRINT("info", ("Offset: %lu length: %lu "
- "Scanner: Cur: (%lu,0x%lx) Hrz: (%lu,0x%lx) "
- "Lst: (%lu,0x%lx) Offset: %u(%x) fixed: %d",
+ "Scanner: Cur: " LSN_FMT " Hrz: " LSN_FMT " "
+ "Lst: " LSN_FMT " Offset: %u(%x) fixed: %d",
(ulong) offset, (ulong) length,
LSN_IN_PARTS(data->scanner.page_addr),
LSN_IN_PARTS(data->scanner.horizon),
@@ -7458,12 +7458,12 @@ static void translog_force_current_buffer_to_finish()
uint16 UNINIT_VAR(current_page_fill), write_counter, previous_offset;
DBUG_ENTER("translog_force_current_buffer_to_finish");
- DBUG_PRINT("enter", ("Buffer #%u 0x%lx "
- "Buffer addr: (%lu,0x%lx) "
- "Page addr: (%lu,0x%lx) "
+ DBUG_PRINT("enter", ("Buffer #%u %p "
+ "Buffer addr: " LSN_FMT " "
+ "Page addr: " LSN_FMT " "
"size: %lu (%lu) Pg: %u left: %u in progress %u",
(uint) old_buffer_no,
- (ulong) old_buffer,
+ old_buffer,
LSN_IN_PARTS(old_buffer->offset),
(ulong) LSN_FILE_NO(log_descriptor.horizon),
(ulong) (LSN_OFFSET(log_descriptor.horizon) -
@@ -7500,10 +7500,10 @@ static void translog_force_current_buffer_to_finish()
memset(log_descriptor.bc.ptr, TRANSLOG_FILLER, left);
old_buffer->size+= left;
- DBUG_PRINT("info", ("Finish Page buffer #%u: 0x%lx "
+ DBUG_PRINT("info", ("Finish Page buffer #%u: %p "
"Size: %lu",
(uint) old_buffer->buffer_no,
- (ulong) old_buffer,
+ old_buffer,
(ulong) old_buffer->size));
DBUG_ASSERT(old_buffer->buffer_no ==
log_descriptor.bc.buffer_no);
@@ -7537,9 +7537,9 @@ static void translog_force_current_buffer_to_finish()
log_descriptor.bc.write_counter= write_counter;
log_descriptor.bc.previous_offset= previous_offset;
new_buffer->prev_last_lsn= BUFFER_MAX_LSN(old_buffer);
- DBUG_PRINT("info", ("prev_last_lsn set to (%lu,0x%lx) buffer: 0x%lx",
+ DBUG_PRINT("info", ("prev_last_lsn set to " LSN_FMT " buffer: %p",
LSN_IN_PARTS(new_buffer->prev_last_lsn),
- (ulong) new_buffer));
+ new_buffer));
/*
Advances this log pointer, increases writers and let other threads to
@@ -7575,8 +7575,8 @@ static void translog_force_current_buffer_to_finish()
*/
DBUG_ASSERT(!old_buffer->is_closing_buffer);
old_buffer->is_closing_buffer= 1; /* Other flushes will wait */
- DBUG_PRINT("enter", ("Buffer #%u 0x%lx is_closing_buffer set",
- (uint) old_buffer->buffer_no, (ulong) old_buffer));
+ DBUG_PRINT("enter", ("Buffer #%u %p is_closing_buffer set",
+ (uint) old_buffer->buffer_no, old_buffer));
translog_wait_for_writers(old_buffer);
#ifndef DBUG_OFF
/* We blocked flushing this buffer so the buffer should not changed */
@@ -7606,12 +7606,12 @@ static void translog_force_current_buffer_to_finish()
uint32 crc= translog_crc(data + log_descriptor.page_overhead,
TRANSLOG_PAGE_SIZE -
log_descriptor.page_overhead);
- DBUG_PRINT("info", ("CRC: 0x%lx", (ulong) crc));
+ DBUG_PRINT("info", ("CRC: 0x%x", crc));
int4store(data + 3 + 3 + 1, crc);
}
old_buffer->is_closing_buffer= 0;
- DBUG_PRINT("enter", ("Buffer #%u 0x%lx is_closing_buffer cleared",
- (uint) old_buffer->buffer_no, (ulong) old_buffer));
+ DBUG_PRINT("enter", ("Buffer #%u %p is_closing_buffer cleared",
+ (uint) old_buffer->buffer_no, old_buffer));
mysql_cond_broadcast(&old_buffer->waiting_filling_buffer);
if (left)
@@ -7650,7 +7650,7 @@ static void translog_force_current_buffer_to_finish()
void translog_flush_wait_for_end(LSN lsn)
{
DBUG_ENTER("translog_flush_wait_for_end");
- DBUG_PRINT("enter", ("LSN: (%lu,0x%lx)", LSN_IN_PARTS(lsn)));
+ DBUG_PRINT("enter", ("LSN: " LSN_FMT, LSN_IN_PARTS(lsn)));
mysql_mutex_assert_owner(&log_descriptor.log_flush_lock);
while (cmp_translog_addr(log_descriptor.flushed, lsn) < 0)
mysql_cond_wait(&log_descriptor.log_flush_cond,
@@ -7670,7 +7670,7 @@ void translog_flush_set_new_goal_and_wait(TRANSLOG_ADDRESS lsn)
{
int flush_no= log_descriptor.flush_no;
DBUG_ENTER("translog_flush_set_new_goal_and_wait");
- DBUG_PRINT("enter", ("LSN: (%lu,0x%lx)", LSN_IN_PARTS(lsn)));
+ DBUG_PRINT("enter", ("LSN: " LSN_FMT, LSN_IN_PARTS(lsn)));
mysql_mutex_assert_owner(&log_descriptor.log_flush_lock);
if (cmp_translog_addr(lsn, log_descriptor.next_pass_max_lsn) > 0)
{
@@ -7776,7 +7776,7 @@ void translog_flush_buffers(TRANSLOG_ADDRESS *lsn,
start_buffer_no= i;
DBUG_PRINT("info",
- ("start from: %u current: %u prev last lsn: (%lu,0x%lx)",
+ ("start from: %u current: %u prev last lsn: " LSN_FMT,
(uint) start_buffer_no, (uint) log_descriptor.bc.buffer_no,
LSN_IN_PARTS(log_descriptor.bc.buffer->prev_last_lsn)));
@@ -7790,7 +7790,7 @@ void translog_flush_buffers(TRANSLOG_ADDRESS *lsn,
{
struct st_translog_buffer *buffer= log_descriptor.bc.buffer;
*lsn= log_descriptor.bc.buffer->last_lsn; /* fix lsn if it was horizon */
- DBUG_PRINT("info", ("LSN to flush fixed to last lsn: (%lu,0x%lx)",
+ DBUG_PRINT("info", ("LSN to flush fixed to last lsn: " LSN_FMT,
LSN_IN_PARTS(*lsn)));
last_buffer_no= log_descriptor.bc.buffer_no;
log_descriptor.is_everything_flushed= 1;
@@ -7817,7 +7817,7 @@ void translog_flush_buffers(TRANSLOG_ADDRESS *lsn,
DBUG_ASSERT(log_descriptor.bc.buffer->prev_last_lsn != LSN_IMPOSSIBLE);
/* fix lsn if it was horizon */
*lsn= log_descriptor.bc.buffer->prev_last_lsn;
- DBUG_PRINT("info", ("LSN to flush fixed to prev last lsn: (%lu,0x%lx)",
+ DBUG_PRINT("info", ("LSN to flush fixed to prev last lsn: " LSN_FMT,
LSN_IN_PARTS(*lsn)));
last_buffer_no= ((log_descriptor.bc.buffer_no + TRANSLOG_BUFFERS_NO -1) %
TRANSLOG_BUFFERS_NO);
@@ -7836,10 +7836,10 @@ void translog_flush_buffers(TRANSLOG_ADDRESS *lsn,
{
struct st_translog_buffer *buffer= log_descriptor.buffers + i;
translog_buffer_lock(buffer);
- DBUG_PRINT("info", ("Check buffer: 0x%lx #: %u "
- "prev last LSN: (%lu,0x%lx) "
- "last LSN: (%lu,0x%lx) status: %s",
- (ulong)(buffer),
+ DBUG_PRINT("info", ("Check buffer:%p #: %u "
+ "prev last LSN: " LSN_FMT " "
+ "last LSN: " LSN_FMT " status: %s",
+ buffer,
(uint) i,
LSN_IN_PARTS(buffer->prev_last_lsn),
LSN_IN_PARTS(buffer->last_lsn),
@@ -7853,7 +7853,7 @@ void translog_flush_buffers(TRANSLOG_ADDRESS *lsn,
buffer->pre_force_close_horizon :
buffer->offset + buffer->size);
/* pre_force_close_horizon is reset during new buffer start */
- DBUG_PRINT("info", ("flush_horizon: (%lu,0x%lx)",
+ DBUG_PRINT("info", ("flush_horizon: " LSN_FMT,
LSN_IN_PARTS(*flush_horizon)));
DBUG_ASSERT(*flush_horizon <= log_descriptor.horizon);
@@ -7922,12 +7922,12 @@ my_bool translog_flush(TRANSLOG_ADDRESS lsn)
my_bool rc= 0;
my_bool hgroup_commit_at_start;
DBUG_ENTER("translog_flush");
- DBUG_PRINT("enter", ("Flush up to LSN: (%lu,0x%lx)", LSN_IN_PARTS(lsn)));
+ DBUG_PRINT("enter", ("Flush up to LSN: " LSN_FMT, LSN_IN_PARTS(lsn)));
DBUG_ASSERT(translog_status == TRANSLOG_OK ||
translog_status == TRANSLOG_READONLY);
mysql_mutex_lock(&log_descriptor.log_flush_lock);
- DBUG_PRINT("info", ("Everything is flushed up to (%lu,0x%lx)",
+ DBUG_PRINT("info", ("Everything is flushed up to " LSN_FMT,
LSN_IN_PARTS(log_descriptor.flushed)));
if (cmp_translog_addr(log_descriptor.flushed, lsn) >= 0)
{
@@ -7956,7 +7956,7 @@ my_bool translog_flush(TRANSLOG_ADDRESS lsn)
}
log_descriptor.flush_in_progress= 1;
flush_horizon= log_descriptor.previous_flush_horizon;
- DBUG_PRINT("info", ("flush_in_progress is set, flush_horizon: (%lu,0x%lx)",
+ DBUG_PRINT("info", ("flush_in_progress is set, flush_horizon: " LSN_FMT,
LSN_IN_PARTS(flush_horizon)));
mysql_mutex_unlock(&log_descriptor.log_flush_lock);
@@ -8019,7 +8019,7 @@ retest:
log_descriptor.next_pass_max_lsn= LSN_IMPOSSIBLE;
/* prevent other thread from continue */
log_descriptor.max_lsn_requester= pthread_self();
- DBUG_PRINT("info", ("flush took next goal: (%lu,0x%lx)",
+ DBUG_PRINT("info", ("flush took next goal: " LSN_FMT,
LSN_IN_PARTS(lsn)));
mysql_mutex_unlock(&log_descriptor.log_flush_lock);
@@ -8129,7 +8129,7 @@ int translog_assign_id_to_share(MARIA_HA *tbl_info, TRN *trn)
}
i= 1; /* scan the whole array */
} while (id == 0);
- DBUG_PRINT("info", ("id_to_share: 0x%lx -> %u", (ulong)share, id));
+ DBUG_PRINT("info", ("id_to_share: %p -> %u", share, id));
fileid_store(log_data, id);
log_array[TRANSLOG_INTERNAL_PARTS + 0].str= log_data;
log_array[TRANSLOG_INTERNAL_PARTS + 0].length= sizeof(log_data);
@@ -8180,8 +8180,8 @@ int translog_assign_id_to_share(MARIA_HA *tbl_info, TRN *trn)
void translog_deassign_id_from_share(MARIA_SHARE *share)
{
- DBUG_PRINT("info", ("id_to_share: 0x%lx id %u -> 0",
- (ulong)share, share->id));
+ DBUG_PRINT("info", ("id_to_share: %p id %u -> 0",
+ share, share->id));
/*
We don't need any mutex as we are called only when closing the last
instance of the table or at the end of REPAIR: no writes can be
@@ -8376,7 +8376,7 @@ LSN translog_first_lsn_in_log()
uint16 chunk_offset;
uchar *page;
DBUG_ENTER("translog_first_lsn_in_log");
- DBUG_PRINT("info", ("Horizon: (%lu,0x%lx)", LSN_IN_PARTS(horizon)));
+ DBUG_PRINT("info", ("Horizon: " LSN_FMT, LSN_IN_PARTS(horizon)));
DBUG_ASSERT(translog_status == TRANSLOG_OK ||
translog_status == TRANSLOG_READONLY);
@@ -8415,7 +8415,7 @@ LSN translog_first_theoretical_lsn()
uchar *page;
TRANSLOG_VALIDATOR_DATA data;
DBUG_ENTER("translog_first_theoretical_lsn");
- DBUG_PRINT("info", ("Horizon: (%lu,0x%lx)", LSN_IN_PARTS(addr)));
+ DBUG_PRINT("info", ("Horizon: " LSN_FMT, LSN_IN_PARTS(addr)));
DBUG_ASSERT(translog_status == TRANSLOG_OK ||
translog_status == TRANSLOG_READONLY);
@@ -8455,7 +8455,7 @@ my_bool translog_purge(TRANSLOG_ADDRESS low)
TRANSLOG_ADDRESS horizon= translog_get_horizon();
int rc= 0;
DBUG_ENTER("translog_purge");
- DBUG_PRINT("enter", ("low: (%lu,0x%lx)", LSN_IN_PARTS(low)));
+ DBUG_PRINT("enter", ("low: " LSN_FMT, LSN_IN_PARTS(low)));
DBUG_ASSERT(translog_status == TRANSLOG_OK ||
translog_status == TRANSLOG_READONLY);
@@ -8880,7 +8880,7 @@ static void dump_header_page(uchar *buff)
printf(" WARNING: page size is not equal compiled in one %lu!!!\n",
(ulong) TRANSLOG_PAGE_SIZE);
printf(" File number %lu\n"
- " Max lsn: (%lu,0x%lx)\n",
+ " Max lsn: " LSN_FMT "\n",
desc.file_number,
LSN_IN_PARTS(desc.max_lsn));
}
@@ -8976,7 +8976,7 @@ static uchar *dump_chunk(uchar *buffer, uchar *ptr)
{
TRANSLOG_ADDRESS gpr_addr= lsn_korr(hdr_ptr);
uint pages= hdr_ptr[LSN_STORE_SIZE];
- printf (" Group +#%u: (%lu,0x%lx) pages: %u\n",
+ printf (" Group +#%u: " LSN_FMT " pages: %u\n",
(uint) i, LSN_IN_PARTS(gpr_addr), pages);
}
}
@@ -9110,8 +9110,8 @@ static void dump_datapage(uchar *buffer, File handler)
ptr= buffer + header_len;
while (ptr && ptr < buffer + TRANSLOG_PAGE_SIZE)
{
- printf(" Chunk (%lu,0x%lx):\n",
- (ulong)file, (ulong) offset + (ptr - buffer));
+ printf(" Chunk %d %lld:\n",
+ file,((longlong) (ptr - buffer)+ offset));
ptr= dump_chunk(buffer, ptr);
}
}
diff --git a/storage/maria/ma_loghandler_lsn.h b/storage/maria/ma_loghandler_lsn.h
index 69481761e80..113b57914c5 100644
--- a/storage/maria/ma_loghandler_lsn.h
+++ b/storage/maria/ma_loghandler_lsn.h
@@ -47,7 +47,8 @@ typedef TRANSLOG_ADDRESS LSN;
#define LSN_FILE_NO_PART(L) ((L) & ((int64)0xFFFFFF00000000LL))
/* Parts of LSN for printing */
-#define LSN_IN_PARTS(L) (ulong)LSN_FILE_NO(L),(ulong)LSN_OFFSET(L)
+#define LSN_IN_PARTS(L) (uint)LSN_FILE_NO(L),(uint)LSN_OFFSET(L)
+#define LSN_FMT "(%u,0x%x)"
/* Gets record offset of a LSN/log address */
#define LSN_OFFSET(L) (ulong) ((L) & 0xFFFFFFFFL)
diff --git a/storage/maria/ma_open.c b/storage/maria/ma_open.c
index c1fdd52357f..5a0c81d3e3e 100644
--- a/storage/maria/ma_open.c
+++ b/storage/maria/ma_open.c
@@ -1383,7 +1383,7 @@ uint _ma_state_info_write(MARIA_SHARE *share, uint pWrite)
is too new). Recovery does it by itself.
*/
share->state.is_of_horizon= translog_get_horizon();
- DBUG_PRINT("info", ("is_of_horizon set to LSN (%lu,0x%lx)",
+ DBUG_PRINT("info", ("is_of_horizon set to LSN " LSN_FMT,
LSN_IN_PARTS(share->state.is_of_horizon)));
}
res= _ma_state_info_write_sub(share->kfile.file, &share->state, pWrite);
diff --git a/storage/maria/ma_page.c b/storage/maria/ma_page.c
index 4021fb8e161..c8901e6d736 100644
--- a/storage/maria/ma_page.c
+++ b/storage/maria/ma_page.c
@@ -544,8 +544,8 @@ my_bool _ma_compact_keypage(MARIA_PAGE *ma_page, TrID min_read_from)
{
if (!(page= (*ma_page->keyinfo->skip_key)(&key, 0, 0, page)))
{
- DBUG_PRINT("error",("Couldn't find last key: page_pos: 0x%lx",
- (long) page));
+ DBUG_PRINT("error",("Couldn't find last key: page_pos: %p",
+ page));
_ma_set_fatal_error(share, HA_ERR_CRASHED);
DBUG_RETURN(1);
}
diff --git a/storage/maria/ma_pagecache.c b/storage/maria/ma_pagecache.c
index a1c407967b7..1c818e6df1e 100644
--- a/storage/maria/ma_pagecache.c
+++ b/storage/maria/ma_pagecache.c
@@ -97,10 +97,10 @@
#define PCBLOCK_INFO(B) \
DBUG_PRINT("info", \
- ("block: 0x%lx fd: %lu page: %lu status: 0x%x " \
- "hshL: 0x%lx requests: %u/%u wrlocks: %u rdlocks: %u " \
+ ("block: %p fd: %lu page: %lu status: 0x%x " \
+ "hshL: %p requests: %u/%u wrlocks: %u rdlocks: %u " \
"rdlocks_q: %u pins: %u type: %s", \
- (ulong)(B), \
+ (B), \
(ulong)((B)->hash_link ? \
(B)->hash_link->file.file : \
0), \
@@ -108,7 +108,7 @@
(B)->hash_link->pageno : \
0), \
(uint) (B)->status, \
- (ulong)(B)->hash_link, \
+ (B)->hash_link, \
(uint) (B)->requests, \
(uint)((B)->hash_link ? \
(B)->hash_link->requests : \
@@ -659,9 +659,9 @@ static my_bool pagecache_fwrite(PAGECACHE *pagecache,
/* Todo: Integrate this with write_callback so we have only one callback */
if ((*filedesc->flush_log_callback)(&args))
DBUG_RETURN(1);
- DBUG_PRINT("info", ("pre_write_hook: 0x%lx data: 0x%lx",
- (ulong) filedesc->pre_write_hook,
- (ulong) filedesc->callback_data));
+ DBUG_PRINT("info", ("pre_write_hook:%p data: %p",
+ filedesc->pre_write_hook,
+ filedesc->callback_data));
if ((*filedesc->pre_write_hook)(&args))
{
DBUG_PRINT("error", ("write callback problem"));
@@ -2789,7 +2789,7 @@ static void check_and_set_lsn(PAGECACHE *pagecache,
*/
DBUG_ASSERT((block->type == PAGECACHE_LSN_PAGE) || maria_in_recovery);
old= lsn_korr(block->buffer);
- DBUG_PRINT("info", ("old lsn: (%lu, 0x%lx) new lsn: (%lu, 0x%lx)",
+ DBUG_PRINT("info", ("old lsn: " LSN_FMT " new lsn: " LSN_FMT,
LSN_IN_PARTS(old), LSN_IN_PARTS(lsn)));
if (cmp_translog_addr(lsn, old) > 0)
{
@@ -3832,8 +3832,8 @@ restart:
block= page_link->block;
if (block->status & (PCBLOCK_REASSIGNED | PCBLOCK_IN_SWITCH))
{
- DBUG_PRINT("info", ("Block 0x%0lx already is %s",
- (ulong) block,
+ DBUG_PRINT("info", ("Block %p already is %s",
+ block,
((block->status & PCBLOCK_REASSIGNED) ?
"reassigned" : "in switch")));
PCBLOCK_INFO(block);
diff --git a/storage/maria/ma_recovery.c b/storage/maria/ma_recovery.c
index b1d2378870f..8a51ff99fc2 100644
--- a/storage/maria/ma_recovery.c
+++ b/storage/maria/ma_recovery.c
@@ -558,7 +558,7 @@ static void display_record_position(const LOG_DESC *log_desc,
form a group, so we indent below the group's end record
*/
tprint(tracef,
- "%sRec#%u LSN (%lu,0x%lx) short_trid %u %s(num_type:%u) len %lu\n",
+ "%sRec#%u LSN " LSN_FMT " short_trid %u %s(num_type:%u) len %lu\n",
number ? "" : " ", number, LSN_IN_PARTS(rec->lsn),
rec->short_trid, log_desc->name, rec->type,
(ulong)rec->record_length);
@@ -617,7 +617,7 @@ prototype_redo_exec_hook(LONG_TRANSACTION_ID)
llstr(long_trid, llbuf);
eprint(tracef, "Found an old transaction long_trid %s short_trid %u"
" with same short id as this new transaction, and has neither"
- " committed nor rollback (undo_lsn: (%lu,0x%lx))",
+ " committed nor rollback (undo_lsn: " LSN_FMT ")",
llbuf, sid, LSN_IN_PARTS(ulsn));
goto err;
}
@@ -640,7 +640,7 @@ static void new_transaction(uint16 sid, TrID long_id, LSN undo_lsn,
all_active_trans[sid].long_trid= long_id;
llstr(long_id, llbuf);
tprint(tracef, "Transaction long_trid %s short_trid %u starts,"
- " undo_lsn (%lu,0x%lx) first_undo_lsn (%lu,0x%lx)\n",
+ " undo_lsn " LSN_FMT " first_undo_lsn " LSN_FMT "\n",
llbuf, sid, LSN_IN_PARTS(undo_lsn), LSN_IN_PARTS(first_undo_lsn));
all_active_trans[sid].undo_lsn= undo_lsn;
all_active_trans[sid].first_undo_lsn= first_undo_lsn;
@@ -833,7 +833,7 @@ prototype_redo_exec_hook(REDO_CREATE_TABLE)
}
if (cmp_translog_addr(share->state.create_rename_lsn, rec->lsn) >= 0)
{
- tprint(tracef, "Table '%s' has create_rename_lsn (%lu,0x%lx) more "
+ tprint(tracef, "Table '%s' has create_rename_lsn " LSN_FMT " more "
"recent than record, ignoring creation",
name, LSN_IN_PARTS(share->state.create_rename_lsn));
error= 0;
@@ -1009,7 +1009,7 @@ prototype_redo_exec_hook(REDO_RENAME_TABLE)
}
if (cmp_translog_addr(share->state.create_rename_lsn, rec->lsn) >= 0)
{
- tprint(tracef, ", has create_rename_lsn (%lu,0x%lx) more recent than"
+ tprint(tracef, ", has create_rename_lsn " LSN_FMT " more recent than"
" record, ignoring renaming",
LSN_IN_PARTS(share->state.create_rename_lsn));
error= 0;
@@ -1064,7 +1064,7 @@ prototype_redo_exec_hook(REDO_RENAME_TABLE)
}
if (cmp_translog_addr(share->state.create_rename_lsn, rec->lsn) >= 0)
{
- tprint(tracef, ", has create_rename_lsn (%lu,0x%lx) more recent than"
+ tprint(tracef, ", has create_rename_lsn " LSN_FMT " more recent than"
" record, ignoring renaming",
LSN_IN_PARTS(share->state.create_rename_lsn));
/*
@@ -1233,7 +1233,7 @@ prototype_redo_exec_hook(REDO_DROP_TABLE)
}
if (cmp_translog_addr(share->state.create_rename_lsn, rec->lsn) >= 0)
{
- tprint(tracef, ", has create_rename_lsn (%lu,0x%lx) more recent than"
+ tprint(tracef, ", has create_rename_lsn " LSN_FMT " more recent than"
" record, ignoring removal",
LSN_IN_PARTS(share->state.create_rename_lsn));
error= 0;
@@ -1403,8 +1403,8 @@ static int new_table(uint16 sid, const char *name, LSN lsn_of_file_id)
}
if (cmp_translog_addr(lsn_of_file_id, share->state.create_rename_lsn) <= 0)
{
- tprint(tracef, ", has create_rename_lsn (%lu,0x%lx) more recent than"
- " LOGREC_FILE_ID's LSN (%lu,0x%lx), ignoring open request",
+ tprint(tracef, ", has create_rename_lsn " LSN_FMT " more recent than"
+ " LOGREC_FILE_ID's LSN " LSN_FMT ", ignoring open request",
LSN_IN_PARTS(share->state.create_rename_lsn),
LSN_IN_PARTS(lsn_of_file_id));
recovery_warnings++;
@@ -1873,7 +1873,7 @@ prototype_redo_exec_hook(UNDO_ROW_INSERT)
share= info->s;
if (cmp_translog_addr(rec->lsn, share->state.is_of_horizon) >= 0)
{
- tprint(tracef, " state has LSN (%lu,0x%lx) older than record, updating"
+ tprint(tracef, " state has LSN " LSN_FMT " older than record, updating"
" rows' count\n", LSN_IN_PARTS(share->state.is_of_horizon));
share->state.state.records++;
if (share->calc_checksum)
@@ -2136,7 +2136,7 @@ prototype_redo_exec_hook(CLR_END)
if (info == NULL)
DBUG_RETURN(0);
share= info->s;
- tprint(tracef, " CLR_END was about %s, undo_lsn now LSN (%lu,0x%lx)\n",
+ tprint(tracef, " CLR_END was about %s, undo_lsn now LSN " LSN_FMT "\n",
log_desc->name, LSN_IN_PARTS(previous_undo_lsn));
enlarge_buffer(rec);
@@ -2296,7 +2296,7 @@ prototype_undo_exec_hook(UNDO_ROW_INSERT)
info->trn= 0;
/* trn->undo_lsn is updated in an inwrite_hook when writing the CLR_END */
tprint(tracef, " rows' count %lu\n", (ulong)info->s->state.state.records);
- tprint(tracef, " undo_lsn now LSN (%lu,0x%lx)\n",
+ tprint(tracef, " undo_lsn now LSN " LSN_FMT "\n",
LSN_IN_PARTS(trn->undo_lsn));
return error;
}
@@ -2335,7 +2335,7 @@ prototype_undo_exec_hook(UNDO_ROW_DELETE)
rec->record_length -
(LSN_STORE_SIZE + FILEID_STORE_SIZE));
info->trn= 0;
- tprint(tracef, " rows' count %lu\n undo_lsn now LSN (%lu,0x%lx)\n",
+ tprint(tracef, " rows' count %lu\n undo_lsn now LSN " LSN_FMT "\n",
(ulong)share->state.state.records, LSN_IN_PARTS(trn->undo_lsn));
return error;
}
@@ -2374,7 +2374,7 @@ prototype_undo_exec_hook(UNDO_ROW_UPDATE)
rec->record_length -
(LSN_STORE_SIZE + FILEID_STORE_SIZE));
info->trn= 0;
- tprint(tracef, " undo_lsn now LSN (%lu,0x%lx)\n",
+ tprint(tracef, " undo_lsn now LSN " LSN_FMT "\n",
LSN_IN_PARTS(trn->undo_lsn));
return error;
}
@@ -2415,7 +2415,7 @@ prototype_undo_exec_hook(UNDO_KEY_INSERT)
FILEID_STORE_SIZE);
info->trn= 0;
/* trn->undo_lsn is updated in an inwrite_hook when writing the CLR_END */
- tprint(tracef, " undo_lsn now LSN (%lu,0x%lx)\n",
+ tprint(tracef, " undo_lsn now LSN " LSN_FMT "\n",
LSN_IN_PARTS(trn->undo_lsn));
return error;
}
@@ -2456,7 +2456,7 @@ prototype_undo_exec_hook(UNDO_KEY_DELETE)
FILEID_STORE_SIZE, FALSE);
info->trn= 0;
/* trn->undo_lsn is updated in an inwrite_hook when writing the CLR_END */
- tprint(tracef, " undo_lsn now LSN (%lu,0x%lx)\n",
+ tprint(tracef, " undo_lsn now LSN " LSN_FMT "\n",
LSN_IN_PARTS(trn->undo_lsn));
return error;
}
@@ -2497,7 +2497,7 @@ prototype_undo_exec_hook(UNDO_KEY_DELETE_WITH_ROOT)
FILEID_STORE_SIZE, TRUE);
info->trn= 0;
/* trn->undo_lsn is updated in an inwrite_hook when writing the CLR_END */
- tprint(tracef, " undo_lsn now LSN (%lu,0x%lx)\n",
+ tprint(tracef, " undo_lsn now LSN " LSN_FMT "\n",
LSN_IN_PARTS(trn->undo_lsn));
return error;
}
@@ -2525,7 +2525,7 @@ prototype_undo_exec_hook(UNDO_BULK_INSERT)
error= _ma_apply_undo_bulk_insert(info, previous_undo_lsn);
info->trn= 0;
/* trn->undo_lsn is updated in an inwrite_hook when writing the CLR_END */
- tprint(tracef, " undo_lsn now LSN (%lu,0x%lx)\n",
+ tprint(tracef, " undo_lsn now LSN " LSN_FMT "\n",
LSN_IN_PARTS(trn->undo_lsn));
return error;
}
@@ -2663,7 +2663,7 @@ static int run_redo_phase(LSN lsn, LSN lsn_end, enum maria_apply_log_way apply)
if (lsn_end != LSN_IMPOSSIBLE && rec2.lsn >= lsn_end)
{
tprint(tracef,
- "lsn_end reached at (%lu,0x%lx). "
+ "lsn_end reached at " LSN_FMT ". "
"Skipping rest of redo entries",
LSN_IN_PARTS(rec2.lsn));
translog_destroy_scanner(&scanner);
@@ -2818,7 +2818,7 @@ static uint end_of_redo_phase(my_bool prepare_for_undo_phase)
TRN *trn;
if (gslsn != LSN_IMPOSSIBLE)
{
- tprint(tracef, "Group at LSN (%lu,0x%lx) short_trid %u incomplete\n",
+ tprint(tracef, "Group at LSN " LSN_FMT " short_trid %u incomplete\n",
LSN_IN_PARTS(gslsn), sid);
all_active_trans[sid].group_start_lsn= LSN_IMPOSSIBLE;
}
@@ -3109,7 +3109,7 @@ static MARIA_HA *get_MARIA_HA_from_REDO_record(const
table was).
*/
DBUG_ASSERT(cmp_translog_addr(rec->lsn, checkpoint_start) < 0);
- tprint(tracef, ", table's LOGREC_FILE_ID has LSN (%lu,0x%lx) more recent"
+ tprint(tracef, ", table's LOGREC_FILE_ID has LSN " LSN_FMT " more recent"
" than record, skipping record",
LSN_IN_PARTS(share->lsn_of_file_id));
return NULL;
@@ -3117,7 +3117,7 @@ static MARIA_HA *get_MARIA_HA_from_REDO_record(const
if (cmp_translog_addr(rec->lsn, share->state.skip_redo_lsn) <= 0)
{
/* probably a bulk insert repair */
- tprint(tracef, ", has skip_redo_lsn (%lu,0x%lx) more recent than"
+ tprint(tracef, ", has skip_redo_lsn " LSN_FMT " more recent than"
" record, skipping record\n",
LSN_IN_PARTS(share->state.skip_redo_lsn));
return NULL;
@@ -3176,7 +3176,7 @@ static MARIA_HA *get_MARIA_HA_from_UNDO_record(const
if (cmp_translog_addr(rec->lsn, share->lsn_of_file_id) <= 0)
{
- tprint(tracef, ", table's LOGREC_FILE_ID has LSN (%lu,0x%lx) more recent"
+ tprint(tracef, ", table's LOGREC_FILE_ID has LSN " LSN_FMT " more recent"
" than record, skipping record",
LSN_IN_PARTS(share->lsn_of_file_id));
return NULL;
@@ -3185,7 +3185,7 @@ static MARIA_HA *get_MARIA_HA_from_UNDO_record(const
cmp_translog_addr(rec->lsn, share->state.skip_redo_lsn) <= 0)
{
/* probably a bulk insert repair */
- tprint(tracef, ", has skip_redo_lsn (%lu,0x%lx) more recent than"
+ tprint(tracef, ", has skip_redo_lsn " LSN_FMT " more recent than"
" record, skipping record\n",
LSN_IN_PARTS(share->state.skip_redo_lsn));
return NULL;
@@ -3220,12 +3220,12 @@ static LSN parse_checkpoint_record(LSN lsn)
LSN minimum_rec_lsn_of_active_transactions, minimum_rec_lsn_of_dirty_pages;
struct st_dirty_page *next_dirty_page_in_pool;
- tprint(tracef, "Loading data from checkpoint record at LSN (%lu,0x%lx)\n",
+ tprint(tracef, "Loading data from checkpoint record at LSN " LSN_FMT "\n",
LSN_IN_PARTS(lsn));
if ((len= translog_read_record_header(lsn, &rec)) == RECHEADER_READ_ERROR ||
rec.type != LOGREC_CHECKPOINT)
{
- eprint(tracef, "Cannot find checkpoint record at LSN (%lu,0x%lx)",
+ eprint(tracef, "Cannot find checkpoint record at LSN " LSN_FMT,
LSN_IN_PARTS(lsn));
return LSN_ERROR;
}
@@ -3243,7 +3243,7 @@ static LSN parse_checkpoint_record(LSN lsn)
ptr= log_record_buffer.str;
start_address= lsn_korr(ptr);
ptr+= LSN_STORE_SIZE;
- tprint(tracef, "Checkpoint record has start_horizon at (%lu,0x%lx)\n",
+ tprint(tracef, "Checkpoint record has start_horizon at " LSN_FMT "\n",
LSN_IN_PARTS(start_address));
/* transactions */
@@ -3261,7 +3261,7 @@ static LSN parse_checkpoint_record(LSN lsn)
takes to write one or a few rows, roughly).
*/
tprint(tracef, "Checkpoint record has min_rec_lsn of active transactions"
- " at (%lu,0x%lx)\n",
+ " at " LSN_FMT "\n",
LSN_IN_PARTS(minimum_rec_lsn_of_active_transactions));
set_if_smaller(start_address, minimum_rec_lsn_of_active_transactions);
@@ -3372,7 +3372,7 @@ static LSN parse_checkpoint_record(LSN lsn)
start_address= checkpoint_start=
translog_next_LSN(start_address, LSN_IMPOSSIBLE);
tprint(tracef, "Checkpoint record start_horizon now adjusted to"
- " LSN (%lu,0x%lx)\n", LSN_IN_PARTS(start_address));
+ " LSN " LSN_FMT "\n", LSN_IN_PARTS(start_address));
if (checkpoint_start == LSN_IMPOSSIBLE)
{
/*
@@ -3383,10 +3383,10 @@ static LSN parse_checkpoint_record(LSN lsn)
}
/* now, where the REDO phase should start reading log: */
tprint(tracef, "Checkpoint has min_rec_lsn of dirty pages at"
- " LSN (%lu,0x%lx)\n", LSN_IN_PARTS(minimum_rec_lsn_of_dirty_pages));
+ " LSN " LSN_FMT "\n", LSN_IN_PARTS(minimum_rec_lsn_of_dirty_pages));
set_if_smaller(start_address, minimum_rec_lsn_of_dirty_pages);
DBUG_PRINT("info",
- ("checkpoint_start: (%lu,0x%lx) start_address: (%lu,0x%lx)",
+ ("checkpoint_start: " LSN_FMT " start_address: " LSN_FMT,
LSN_IN_PARTS(checkpoint_start), LSN_IN_PARTS(start_address)));
return start_address;
}
diff --git a/storage/maria/ma_rkey.c b/storage/maria/ma_rkey.c
index 58e47089ce9..c98cdfe15ef 100644
--- a/storage/maria/ma_rkey.c
+++ b/storage/maria/ma_rkey.c
@@ -36,8 +36,8 @@ int maria_rkey(MARIA_HA *info, uchar *buf, int inx, const uchar *key_data,
MARIA_KEY key;
ICP_RESULT icp_res= ICP_MATCH;
DBUG_ENTER("maria_rkey");
- DBUG_PRINT("enter", ("base: 0x%lx buf: 0x%lx inx: %d search_flag: %d",
- (long) info, (long) buf, inx, search_flag));
+ DBUG_PRINT("enter", ("base:%p buf:%p inx: %d search_flag: %d",
+ info, buf, inx, search_flag));
if ((inx = _ma_check_index(info,inx)) < 0)
DBUG_RETURN(my_errno);
diff --git a/storage/maria/ma_rt_split.c b/storage/maria/ma_rt_split.c
index c26c0277e4f..804cfe75558 100644
--- a/storage/maria/ma_rt_split.c
+++ b/storage/maria/ma_rt_split.c
@@ -308,7 +308,7 @@ static my_bool _ma_log_rt_split(MARIA_PAGE *page,
uint translog_parts, extra_length= 0;
my_off_t page_pos;
DBUG_ENTER("_ma_log_rt_split");
- DBUG_PRINT("enter", ("page: %lu", (ulong) page));
+ DBUG_PRINT("enter", ("page: %p", page));
DBUG_ASSERT(share->now_transactional);
page_pos= page->pos / share->block_size;
diff --git a/storage/maria/ma_search.c b/storage/maria/ma_search.c
index 951850b16a4..87e422d0230 100644
--- a/storage/maria/ma_search.c
+++ b/storage/maria/ma_search.c
@@ -380,8 +380,8 @@ int _ma_seq_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page,
{
_ma_set_fatal_error(share, HA_ERR_CRASHED);
DBUG_PRINT("error",
- ("Found wrong key: length: %u page: 0x%lx end: 0x%lx",
- length, (long) page, (long) end));
+ ("Found wrong key: length: %u page: %p end: %p",
+ length, page, end));
DBUG_RETURN(MARIA_FOUND_WRONG_KEY);
}
if ((flag= ha_key_cmp(keyinfo->seg, t_buff, key->data,
@@ -389,15 +389,15 @@ int _ma_seq_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page,
comp_flag | tmp_key.flag,
not_used)) >= 0)
break;
- DBUG_PRINT("loop_extra",("page: 0x%lx key: '%s' flag: %d",
- (long) page, t_buff, flag));
+ DBUG_PRINT("loop_extra",("page:%p key: '%s' flag: %d",
+ page, t_buff, flag));
memcpy(buff,t_buff,length);
*ret_pos=page;
}
if (flag == 0)
memcpy(buff,t_buff,length); /* Result is first key */
*last_key= page == end;
- DBUG_PRINT("exit",("flag: %d ret_pos: 0x%lx", flag, (long) *ret_pos));
+ DBUG_PRINT("exit",("flag: %d ret_pos: %p", flag, *ret_pos));
DBUG_RETURN(flag);
} /* _ma_seq_search */
@@ -555,8 +555,8 @@ int _ma_prefix_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page,
{
_ma_set_fatal_error(share, HA_ERR_CRASHED);
DBUG_PRINT("error",
- ("Found wrong key: length: %u page: 0x%lx end: %lx",
- length, (long) page, (long) end));
+ ("Found wrong key: length: %u page: %p end: %p",
+ length, page, end));
DBUG_RETURN(MARIA_FOUND_WRONG_KEY);
}
@@ -692,7 +692,7 @@ int _ma_prefix_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page,
*last_key= page == end;
- DBUG_PRINT("exit",("flag: %d ret_pos: 0x%lx", flag, (long) *ret_pos));
+ DBUG_PRINT("exit",("flag: %d ret_pos: %p", flag, *ret_pos));
DBUG_RETURN(flag);
} /* _ma_prefix_search */
@@ -1047,8 +1047,8 @@ uint _ma_get_pack_key(MARIA_KEY *int_key, uint page_flag,
if (length > keyseg->length)
{
DBUG_PRINT("error",
- ("Found too long null packed key: %u of %u at 0x%lx",
- length, keyseg->length, (long) *page_pos));
+ ("Found too long null packed key: %u of %u at %p",
+ length, keyseg->length, *page_pos));
DBUG_DUMP("key", *page_pos, 16);
_ma_set_fatal_error(keyinfo->share, HA_ERR_CRASHED);
return 0;
@@ -1104,8 +1104,8 @@ uint _ma_get_pack_key(MARIA_KEY *int_key, uint page_flag,
}
if (length > (uint) keyseg->length)
{
- DBUG_PRINT("error",("Found too long packed key: %u of %u at 0x%lx",
- length, keyseg->length, (long) *page_pos));
+ DBUG_PRINT("error",("Found too long packed key: %u of %u at %p",
+ length, keyseg->length, *page_pos));
DBUG_DUMP("key", *page_pos, 16);
_ma_set_fatal_error(keyinfo->share, HA_ERR_CRASHED);
return 0; /* Error */
@@ -1263,8 +1263,8 @@ uint _ma_get_binary_pack_key(MARIA_KEY *int_key, uint page_flag, uint nod_flag,
if (length > keyinfo->maxlength)
{
DBUG_PRINT("error",
- ("Found too long binary packed key: %u of %u at 0x%lx",
- length, keyinfo->maxlength, (long) *page_pos));
+ ("Found too long binary packed key: %u of %u at %p",
+ length, keyinfo->maxlength, *page_pos));
DBUG_DUMP("key", *page_pos, 16);
_ma_set_fatal_error(keyinfo->share, HA_ERR_CRASHED);
DBUG_RETURN(0); /* Wrong key */
@@ -1325,8 +1325,8 @@ uint _ma_get_binary_pack_key(MARIA_KEY *int_key, uint page_flag, uint nod_flag,
from=page; from_end=page_end;
}
DBUG_ASSERT((int) length >= 0);
- DBUG_PRINT("info",("key: 0x%lx from: 0x%lx length: %u",
- (long) key, (long) from, length));
+ DBUG_PRINT("info",("key: %p from: %p length: %u",
+ key, from, length));
memmove(key, from, (size_t) length);
key+=length;
from+=length;
@@ -1452,7 +1452,7 @@ uchar *_ma_get_key(MARIA_KEY *key, MARIA_PAGE *ma_page, uchar *keypos)
}
}
}
- DBUG_PRINT("exit",("page: 0x%lx length: %u", (long) page,
+ DBUG_PRINT("exit",("page: %p length: %u", page,
key->data_length + key->ref_length));
DBUG_RETURN(page);
} /* _ma_get_key */
@@ -1522,8 +1522,8 @@ uchar *_ma_get_last_key(MARIA_KEY *key, MARIA_PAGE *ma_page, uchar *endpos)
uchar *lastpos, *page;
MARIA_KEYDEF *keyinfo= key->keyinfo;
DBUG_ENTER("_ma_get_last_key");
- DBUG_PRINT("enter",("page: 0x%lx endpos: 0x%lx", (long) ma_page->buff,
- (long) endpos));
+ DBUG_PRINT("enter",("page: %p endpos: %p", ma_page->buff,
+ endpos));
page_flag= ma_page->flag;
nod_flag= ma_page->node;
@@ -1548,14 +1548,14 @@ uchar *_ma_get_last_key(MARIA_KEY *key, MARIA_PAGE *ma_page, uchar *endpos)
lastpos= page;
if (!(*keyinfo->get_key)(key, page_flag, nod_flag, &page))
{
- DBUG_PRINT("error",("Couldn't find last key: page: 0x%lx",
- (long) page));
+ DBUG_PRINT("error",("Couldn't find last key: page: %p",
+ page));
_ma_set_fatal_error(keyinfo->share, HA_ERR_CRASHED);
DBUG_RETURN(0);
}
}
}
- DBUG_PRINT("exit",("lastpos: 0x%lx length: %u", (ulong) lastpos,
+ DBUG_PRINT("exit",("lastpos: %p length: %u", lastpos,
key->data_length + key->ref_length));
DBUG_RETURN(lastpos);
} /* _ma_get_last_key */
@@ -1654,9 +1654,9 @@ int _ma_search_next(register MARIA_HA *info, MARIA_KEY *key,
MARIA_KEY tmp_key;
MARIA_PAGE page;
DBUG_ENTER("_ma_search_next");
- DBUG_PRINT("enter",("nextflag: %u lastpos: %lu int_keypos: 0x%lx page_changed %d keyread_buff_used: %d",
+ DBUG_PRINT("enter",("nextflag: %u lastpos: %lu int_keypos:%p page_changed %d keyread_buff_used: %d",
nextflag, (ulong) info->cur_row.lastpos,
- (ulong) info->int_keypos,
+ info->int_keypos,
info->page_changed, info->keyread_buff_used));
DBUG_EXECUTE("key", _ma_print_key(DBUG_FILE, key););
@@ -2142,8 +2142,8 @@ _ma_calc_var_pack_key_length(const MARIA_KEY *int_key, uint nod_flag,
ref_length=0;
next_length_pack=0;
}
- DBUG_PRINT("test",("length: %d next_key: 0x%lx", length,
- (long) next_key));
+ DBUG_PRINT("test",("length: %d next_key: %p", length,
+ next_key));
{
uint tmp_length;
diff --git a/storage/maria/ma_servicethread.c b/storage/maria/ma_servicethread.c
index e495b15eef2..99ae36689de 100644
--- a/storage/maria/ma_servicethread.c
+++ b/storage/maria/ma_servicethread.c
@@ -31,7 +31,7 @@ int ma_service_thread_control_init(MA_SERVICE_THREAD_CONTROL *control)
{
int res= 0;
DBUG_ENTER("ma_service_thread_control_init");
- DBUG_PRINT("init", ("control 0x%lx", (ulong) control));
+ DBUG_PRINT("init", ("control %p", control));
control->inited= TRUE;
control->killed= FALSE;
res= (mysql_mutex_init(key_SERVICE_THREAD_CONTROL_lock,
@@ -57,7 +57,7 @@ int ma_service_thread_control_init(MA_SERVICE_THREAD_CONTROL *control)
void ma_service_thread_control_end(MA_SERVICE_THREAD_CONTROL *control)
{
DBUG_ENTER("ma_service_thread_control_end");
- DBUG_PRINT("init", ("control 0x%lx", (ulong) control));
+ DBUG_PRINT("init", ("control %p", control));
DBUG_ASSERT(control->inited);
mysql_mutex_lock(control->LOCK_control);
if (!control->killed)
@@ -95,7 +95,7 @@ my_bool my_service_thread_sleep(MA_SERVICE_THREAD_CONTROL *control,
struct timespec abstime;
my_bool res= FALSE;
DBUG_ENTER("my_service_thread_sleep");
- DBUG_PRINT("init", ("control 0x%lx", (ulong) control));
+ DBUG_PRINT("init", ("control %p", control));
mysql_mutex_lock(control->LOCK_control);
if (control->killed)
{
diff --git a/storage/maria/ma_state.c b/storage/maria/ma_state.c
index 15cc48ad468..05bc8a8acb8 100644
--- a/storage/maria/ma_state.c
+++ b/storage/maria/ma_state.c
@@ -86,8 +86,8 @@ my_bool _ma_setup_live_state(MARIA_HA *info)
mysql_mutex_lock(&share->intern_lock);
share->in_trans++;
- DBUG_PRINT("info", ("share: 0x%lx in_trans: %d",
- (ulong) share, share->in_trans));
+ DBUG_PRINT("info", ("share: %p in_trans: %d",
+ share, share->in_trans));
history= share->state_history;
@@ -524,8 +524,8 @@ my_bool _ma_trnman_end_trans_hook(TRN *trn, my_bool commit,
/* Remove not visible states */
share->state_history= _ma_remove_not_visible_states(history, 0, 1);
}
- DBUG_PRINT("info", ("share: 0x%lx in_trans: %d",
- (ulong) share, share->in_trans));
+ DBUG_PRINT("info", ("share: %p in_trans: %d",
+ share, share->in_trans));
}
}
share->in_trans--;
diff --git a/storage/maria/ma_write.c b/storage/maria/ma_write.c
index 06aa2da7ae2..ffebb8c0ac9 100644
--- a/storage/maria/ma_write.c
+++ b/storage/maria/ma_write.c
@@ -787,7 +787,7 @@ int _ma_insert(register MARIA_HA *info, MARIA_KEY *key,
MARIA_SHARE *share= info->s;
MARIA_KEYDEF *keyinfo= key->keyinfo;
DBUG_ENTER("_ma_insert");
- DBUG_PRINT("enter",("key_pos: 0x%lx", (ulong) key_pos));
+ DBUG_PRINT("enter",("key_pos:%p", key_pos));
DBUG_EXECUTE("key", _ma_print_key(DBUG_FILE, key););
/*
@@ -813,8 +813,8 @@ int _ma_insert(register MARIA_HA *info, MARIA_KEY *key,
{
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: 0x%lx",
- s_temp.n_ref_length, s_temp.n_length, (long) s_temp.key));
+ 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
if (t_length > 0)
@@ -1128,8 +1128,8 @@ uchar *_ma_find_half_pos(MARIA_KEY *key, MARIA_PAGE *ma_page,
DBUG_RETURN(0);
} while (page < end);
*after_key= page;
- DBUG_PRINT("exit",("returns: 0x%lx page: 0x%lx half: 0x%lx",
- (long) lastpos, (long) page, (long) end));
+ DBUG_PRINT("exit",("returns: %p page: %p half: %p",
+ lastpos, page, end));
DBUG_RETURN(lastpos);
} /* _ma_find_half_pos */
@@ -1211,8 +1211,8 @@ static uchar *_ma_find_last_pos(MARIA_KEY *int_key, MARIA_PAGE *ma_page,
} while (page < end);
*after_key=lastpos;
- DBUG_PRINT("exit",("returns: 0x%lx page: 0x%lx end: 0x%lx",
- (long) prevpos,(long) page,(long) end));
+ DBUG_PRINT("exit",("returns: %p page: %p end: %p",
+ prevpos,page,end));
DBUG_RETURN(prevpos);
} /* _ma_find_last_pos */
diff --git a/storage/maria/maria_chk.c b/storage/maria/maria_chk.c
index fc3d3492252..cb8b374691e 100644
--- a/storage/maria/maria_chk.c
+++ b/storage/maria/maria_chk.c
@@ -1526,8 +1526,8 @@ static void descript(HA_CHECK *param, register MARIA_HA *info, char *name)
}
if (share->base.born_transactional)
{
- printf("LSNs: create_rename (%lu,0x%lx),"
- " state_horizon (%lu,0x%lx), skip_redo (%lu,0x%lx)\n",
+ printf("LSNs: create_rename " LSN_FMT ","
+ " state_horizon " LSN_FMT ", skip_redo " LSN_FMT "\n",
LSN_IN_PARTS(share->state.create_rename_lsn),
LSN_IN_PARTS(share->state.is_of_horizon),
LSN_IN_PARTS(share->state.skip_redo_lsn));
diff --git a/storage/maria/maria_read_log.c b/storage/maria/maria_read_log.c
index a0724b2199b..c4570922e08 100644
--- a/storage/maria/maria_read_log.c
+++ b/storage/maria/maria_read_log.c
@@ -109,11 +109,11 @@ int main(int argc, char **argv)
last_checkpoint_lsn != LSN_IMPOSSIBLE)
{
lsn= LSN_IMPOSSIBLE; /* LSN set in maria_apply_log() */
- fprintf(stdout, "Starting from checkpoint (%lu,0x%lx)\n",
+ fprintf(stdout, "Starting from checkpoint " LSN_FMT "\n",
LSN_IN_PARTS(last_checkpoint_lsn));
}
else
- fprintf(stdout, "The transaction log starts from lsn (%lu,0x%lx)\n",
+ fprintf(stdout, "The transaction log starts from lsn " LSN_FMT "\n",
LSN_IN_PARTS(lsn));
if (opt_start_from_lsn)
@@ -125,7 +125,7 @@ int main(int argc, char **argv)
goto err;
}
lsn= (LSN) opt_start_from_lsn;
- fprintf(stdout, "Starting reading log from lsn (%lu,0x%lx)\n",
+ fprintf(stdout, "Starting reading log from lsn " LSN_FMT "\n",
LSN_IN_PARTS(lsn));
}
diff --git a/storage/maria/unittest/ma_test_loghandler-t.c b/storage/maria/unittest/ma_test_loghandler-t.c
index aa8615e9b77..02922ed9331 100644
--- a/storage/maria/unittest/ma_test_loghandler-t.c
+++ b/storage/maria/unittest/ma_test_loghandler-t.c
@@ -114,7 +114,7 @@ static my_bool check_content(uchar *ptr, ulong length)
void read_ok(TRANSLOG_HEADER_BUFFER *rec)
{
- ok(1, "read record type: %u LSN: (%lu,0x%lx)",
+ ok(1, "read record type: %u LSN: " LSN_FMT,
rec->type, LSN_IN_PARTS(rec->lsn));
}
@@ -399,7 +399,7 @@ int main(int argc __attribute__((unused)), char *argv[])
fprintf(stderr, "Incorrect LOGREC_FIXED_RECORD_0LSN_EXAMPLE "
"data read(0)\n"
"type %u, strid %u, len %u, i: %u, 4: %u 5: %u, "
- "lsn(%lu,0x%lx)\n",
+ "lsn" LSN_FMT "\n",
(uint) rec.type, (uint) rec.short_trid, (uint) rec.record_length,
(uint) uint4korr(rec.header), (uint) rec.header[4],
(uint) rec.header[5],
@@ -444,8 +444,8 @@ int main(int argc __attribute__((unused)), char *argv[])
fprintf(stderr, "Incorrect LOGREC_FIXED_RECORD_1LSN_EXAMPLE "
"data read(%d) "
"type: %u strid: %u len: %u"
- "ref: (%lu,0x%lx) (%lu,0x%lx) "
- "lsn(%lu,0x%lx)\n",
+ "ref: " LSN_FMT " " LSN_FMT " "
+ "lsn" LSN_FMT "\n",
i, (uint) rec.type, (uint) rec.short_trid,
(uint) rec.record_length,
LSN_IN_PARTS(ref), LSN_IN_PARTS(lsn),
@@ -475,9 +475,9 @@ int main(int argc __attribute__((unused)), char *argv[])
{
fprintf(stderr, "Incorrect LOGREC_FIXED_RECORD_2LSN_EXAMPLE "
"data read(%d) "
- "type %u, strid %u, len %u, ref1(%lu,0x%lx), "
- "ref2(%lu,0x%lx) %x%x%x%x%x%x%x%x%x "
- "lsn(%lu,0x%lx)\n",
+ "type %u, strid %u, len %u, ref1" LSN_FMT ", "
+ "ref2" LSN_FMT " %x%x%x%x%x%x%x%x%x "
+ "lsn" LSN_FMT "\n",
i, (uint) rec.type, (uint) rec.short_trid,
(uint) rec.record_length,
LSN_IN_PARTS(ref1), LSN_IN_PARTS(ref2),
@@ -522,7 +522,7 @@ int main(int argc __attribute__((unused)), char *argv[])
"data read(%d)"
"type %u (%d), strid %u (%d), len %lu, %lu + 7 (%d), "
"hdr len: %u (%d), "
- "ref(%lu,0x%lx), lsn(%lu,0x%lx) (%d), content: %d\n",
+ "ref" LSN_FMT ", lsn" LSN_FMT " (%d), content: %d\n",
i, (uint) rec.type,
rec.type != LOGREC_VARIABLE_RECORD_1LSN_EXAMPLE,
(uint) rec.short_trid,
@@ -541,7 +541,7 @@ int main(int argc __attribute__((unused)), char *argv[])
{
fprintf(stderr,
"Incorrect LOGREC_VARIABLE_RECORD_1LSN_EXAMPLE "
- "in whole rec read lsn(%lu,0x%lx)\n",
+ "in whole rec read lsn" LSN_FMT "\n",
LSN_IN_PARTS(rec.lsn));
goto err;
}
@@ -565,8 +565,8 @@ int main(int argc __attribute__((unused)), char *argv[])
fprintf(stderr, "Incorrect LOGREC_VARIABLE_RECORD_2LSN_EXAMPLE "
"data read(%d) "
"type %u, strid %u, len %lu != %lu + 14, hdr len: %d, "
- "ref1(%lu,0x%lx), ref2(%lu,0x%lx), "
- "lsn(%lu,0x%lx)\n",
+ "ref1" LSN_FMT ", ref2" LSN_FMT ", "
+ "lsn" LSN_FMT "\n",
i, (uint) rec.type, (uint) rec.short_trid,
(ulong) rec.record_length, (ulong) rec_len,
len, LSN_IN_PARTS(ref1), LSN_IN_PARTS(ref2),
@@ -577,7 +577,7 @@ int main(int argc __attribute__((unused)), char *argv[])
{
fprintf(stderr,
"Incorrect LOGREC_VARIABLE_RECORD_2LSN_EXAMPLE "
- "in whole rec read lsn(%lu,0x%lx)\n",
+ "in whole rec read lsn" LSN_FMT "\n",
LSN_IN_PARTS(rec.lsn));
goto err;
}
@@ -606,7 +606,7 @@ int main(int argc __attribute__((unused)), char *argv[])
fprintf(stderr, "Incorrect LOGREC_FIXED_RECORD_0LSN_EXAMPLE "
"data read(%d)\n"
"type %u, strid %u, len %u, i: %u, 4: %u 5: %u "
- "lsn(%lu,0x%lx)\n",
+ "lsn" LSN_FMT "\n",
i, (uint) rec.type, (uint) rec.short_trid,
(uint) rec.record_length,
(uint) uint4korr(rec.header), (uint) rec.header[4],
@@ -629,7 +629,7 @@ int main(int argc __attribute__((unused)), char *argv[])
fprintf(stderr, "Incorrect LOGREC_VARIABLE_RECORD_0LSN_EXAMPLE "
"data read(%d) "
"type %u, strid %u, len %lu != %lu, hdr len: %d, "
- "lsn(%lu,0x%lx)\n",
+ "lsn" LSN_FMT "\n",
i, (uint) rec.type, (uint) rec.short_trid,
(ulong) rec.record_length, (ulong) rec_len,
len, LSN_IN_PARTS(rec.lsn));
@@ -639,7 +639,7 @@ int main(int argc __attribute__((unused)), char *argv[])
{
fprintf(stderr,
"Incorrect LOGREC_VARIABLE_RECORD_2LSN_EXAMPLE "
- "in whole rec read lsn(%lu,0x%lx)\n",
+ "in whole rec read lsn" LSN_FMT "\n",
LSN_IN_PARTS(rec.lsn));
goto err;
}
diff --git a/storage/maria/unittest/ma_test_loghandler_first_lsn-t.c b/storage/maria/unittest/ma_test_loghandler_first_lsn-t.c
index 9306be3958e..87f0cf6c72c 100644
--- a/storage/maria/unittest/ma_test_loghandler_first_lsn-t.c
+++ b/storage/maria/unittest/ma_test_loghandler_first_lsn-t.c
@@ -102,7 +102,7 @@ int main(int argc __attribute__((unused)), char *argv[])
first_lsn= translog_first_lsn_in_log();
if (first_lsn != LSN_IMPOSSIBLE)
{
- fprintf(stderr, "Incorrect first lsn response (%lu,0x%lx).",
+ fprintf(stderr, "Incorrect first lsn response " LSN_FMT ".",
LSN_IN_PARTS(first_lsn));
translog_destroy();
exit(1);
@@ -140,8 +140,8 @@ int main(int argc __attribute__((unused)), char *argv[])
first_lsn= translog_first_lsn_in_log();
if (first_lsn != theor_lsn)
{
- fprintf(stderr, "Incorrect first lsn: (%lu,0x%lx) "
- " theoretical first: (%lu,0x%lx)\n",
+ fprintf(stderr, "Incorrect first lsn: " LSN_FMT " "
+ " theoretical first: " LSN_FMT "\n",
LSN_IN_PARTS(first_lsn), LSN_IN_PARTS(theor_lsn));
translog_destroy();
exit(1);
diff --git a/storage/maria/unittest/ma_test_loghandler_max_lsn-t.c b/storage/maria/unittest/ma_test_loghandler_max_lsn-t.c
index 9ff391b3814..6cb2fcb55e5 100644
--- a/storage/maria/unittest/ma_test_loghandler_max_lsn-t.c
+++ b/storage/maria/unittest/ma_test_loghandler_max_lsn-t.c
@@ -94,7 +94,7 @@ int main(int argc __attribute__((unused)), char *argv[])
}
if (max_lsn != LSN_IMPOSSIBLE)
{
- fprintf(stderr, "Incorrect first lsn response (%lu,0x%lx).",
+ fprintf(stderr, "Incorrect first lsn response " LSN_FMT ".",
LSN_IN_PARTS(max_lsn));
translog_destroy();
exit(1);
@@ -138,8 +138,8 @@ int main(int argc __attribute__((unused)), char *argv[])
}
if (max_lsn != last_lsn)
{
- fprintf(stderr, "Incorrect max lsn: (%lu,0x%lx) "
- " last lsn on first file: (%lu,0x%lx)\n",
+ fprintf(stderr, "Incorrect max lsn: " LSN_FMT " "
+ " last lsn on first file: " LSN_FMT "\n",
LSN_IN_PARTS(max_lsn), LSN_IN_PARTS(last_lsn));
translog_destroy();
exit(1);
diff --git a/storage/maria/unittest/ma_test_loghandler_multigroup-t.c b/storage/maria/unittest/ma_test_loghandler_multigroup-t.c
index 39cff18a3ab..776fcb56570 100644
--- a/storage/maria/unittest/ma_test_loghandler_multigroup-t.c
+++ b/storage/maria/unittest/ma_test_loghandler_multigroup-t.c
@@ -533,7 +533,7 @@ int main(int argc __attribute__((unused)), char *argv[])
{
fprintf(stderr, "Incorrect LOGREC_FIXED_RECORD_1LSN_EXAMPLE "
"data read(%d)"
- "type %u, strid %u, len %u, ref(%lu,0x%lx), lsn(%lu,0x%lx)\n",
+ "type %u, strid %u, len %u, ref" LSN_FMT ", lsn" LSN_FMT "\n",
i, (uint) rec.type, (uint) rec.short_trid,
(uint) rec.record_length,
LSN_IN_PARTS(ref), LSN_IN_PARTS(rec.lsn));
@@ -563,9 +563,9 @@ int main(int argc __attribute__((unused)), char *argv[])
{
fprintf(stderr, "Incorrect LOGREC_FIXED_RECORD_2LSN_EXAMPLE "
"data read(%d) "
- "type %u, strid %u, len %u, ref1(%lu,0x%lx), "
- "ref2(%lu,0x%lx) %x%x%x%x%x%x%x%x%x "
- "lsn(%lu,0x%lx)\n",
+ "type %u, strid %u, len %u, ref1" LSN_FMT ", "
+ "ref2" LSN_FMT " %x%x%x%x%x%x%x%x%x "
+ "lsn" LSN_FMT "\n",
i, (uint) rec.type, (uint) rec.short_trid,
(uint) rec.record_length,
LSN_IN_PARTS(ref1), LSN_IN_PARTS(ref2),
@@ -611,7 +611,7 @@ int main(int argc __attribute__((unused)), char *argv[])
"data read(%d)"
"type %u (%d), strid %u (%d), len %lu, %lu + 7 (%d), "
"hdr len: %d (%d), "
- "ref(%lu,0x%lx), lsn(%lu,0x%lx) (%d), content: %d\n",
+ "ref" LSN_FMT ", lsn" LSN_FMT " (%d), content: %d\n",
i, (uint) rec.type,
rec.type !=LOGREC_VARIABLE_RECORD_1LSN_EXAMPLE,
(uint) rec.short_trid,
@@ -631,7 +631,7 @@ int main(int argc __attribute__((unused)), char *argv[])
{
fprintf(stderr,
"Incorrect LOGREC_VARIABLE_RECORD_1LSN_EXAMPLE "
- "in whole rec read lsn(%lu,0x%lx)\n",
+ "in whole rec read lsn" LSN_FMT "\n",
LSN_IN_PARTS(rec.lsn));
translog_free_record_header(&rec);
goto err;
@@ -655,8 +655,8 @@ int main(int argc __attribute__((unused)), char *argv[])
fprintf(stderr, "Incorrect LOGREC_VARIABLE_RECORD_2LSN_EXAMPLE "
" data read(%d) "
"type %u, strid %u, len %lu != %lu + 14, hdr len: %d, "
- "ref1(%lu,0x%lx), ref2(%lu,0x%lx), "
- "lsn(%lu,0x%lx)\n",
+ "ref1" LSN_FMT ", ref2" LSN_FMT ", "
+ "lsn" LSN_FMT "\n",
i, (uint) rec.type, (uint) rec.short_trid,
(ulong) rec.record_length, (ulong) rec_len,
len,
@@ -669,7 +669,7 @@ int main(int argc __attribute__((unused)), char *argv[])
{
fprintf(stderr,
"Incorrect LOGREC_VARIABLE_RECORD_2LSN_EXAMPLE "
- "in whole rec read lsn(%lu,0x%lx)\n",
+ "in whole rec read lsn" LSN_FMT "\n",
LSN_IN_PARTS(rec.lsn));
translog_free_record_header(&rec);
goto err;
@@ -701,7 +701,7 @@ int main(int argc __attribute__((unused)), char *argv[])
fprintf(stderr, "Incorrect LOGREC_FIXED_RECORD_0LSN_EXAMPLE "
"data read(%d)\n"
"type %u, strid %u, len %u, i: %u, 4: %u 5: %u "
- "lsn(%lu,0x%lx)\n",
+ "lsn" LSN_FMT "\n",
i, (uint) rec.type, (uint) rec.short_trid,
(uint) rec.record_length,
(uint)uint4korr(rec.header), (uint) rec.header[4],
@@ -725,7 +725,7 @@ int main(int argc __attribute__((unused)), char *argv[])
fprintf(stderr, "Incorrect LOGREC_VARIABLE_RECORD_0LSN_EXAMPLE "
"data read(%d) "
"type %u, strid %u, len %lu != %lu, hdr len: %d, "
- "lsn(%lu,0x%lx)\n",
+ "lsn" LSN_FMT "\n",
i, (uint) rec.type, (uint) rec.short_trid,
(ulong) rec.record_length, (ulong) rec_len,
len, LSN_IN_PARTS(rec.lsn));
@@ -736,7 +736,7 @@ int main(int argc __attribute__((unused)), char *argv[])
{
fprintf(stderr,
"Incorrect LOGREC_VARIABLE_RECORD_2LSN_EXAMPLE "
- "in whole rec read lsn(%lu,0x%lx)\n",
+ "in whole rec read lsn" LSN_FMT "\n",
LSN_IN_PARTS(rec.lsn));
translog_free_record_header(&rec);
goto err;
diff --git a/storage/maria/unittest/ma_test_loghandler_multithread-t.c b/storage/maria/unittest/ma_test_loghandler_multithread-t.c
index ff843937fcd..8b834527dd0 100644
--- a/storage/maria/unittest/ma_test_loghandler_multithread-t.c
+++ b/storage/maria/unittest/ma_test_loghandler_multithread-t.c
@@ -486,7 +486,7 @@ int main(int argc __attribute__((unused)),
fprintf(stderr, "Incorrect LOGREC_FIXED_RECORD_0LSN_EXAMPLE "
"data read(%d)\n"
"type %u, strid %u %u, len %u, i: %u %u, "
- "lsn(%lu,0x%lx) (%lu,0x%lx)\n",
+ "lsn" LSN_FMT " " LSN_FMT "\n",
i, (uint) rec.type,
(uint) rec.short_trid, (uint) uint2korr(rec.header),
(uint) rec.record_length,
@@ -510,7 +510,7 @@ int main(int argc __attribute__((unused)),
"data read(%d) "
"thread: %d, iteration %d, stage %d\n"
"type %u (%d), len %d, length %lu %lu (%d) "
- "lsn(%lu,0x%lx) (%lu,0x%lx)\n",
+ "lsn" LSN_FMT " " LSN_FMT "\n",
i, (uint) rec.short_trid, index, stage,
(uint) rec.type, (rec.type !=
LOGREC_VARIABLE_RECORD_0LSN_EXAMPLE),
@@ -526,7 +526,7 @@ int main(int argc __attribute__((unused)),
{
fprintf(stderr,
"Incorrect LOGREC_VARIABLE_RECORD_0LSN_EXAMPLE "
- "in whole rec read lsn(%lu,0x%lx)\n",
+ "in whole rec read lsn" LSN_FMT "\n",
LSN_IN_PARTS(rec.lsn));
translog_free_record_header(&rec);
goto err;
diff --git a/storage/maria/unittest/ma_test_loghandler_noflush-t.c b/storage/maria/unittest/ma_test_loghandler_noflush-t.c
index 9555cc0842f..2be6dc1da3c 100644
--- a/storage/maria/unittest/ma_test_loghandler_noflush-t.c
+++ b/storage/maria/unittest/ma_test_loghandler_noflush-t.c
@@ -116,7 +116,7 @@ int main(int argc __attribute__((unused)), char *argv[])
"data read(0)\n"
"type: %u (%d) strid: %u (%d) len: %u (%d) i: %u (%d), "
"4: %u (%d) 5: %u (%d) "
- "lsn(%lu,0x%lx) (%d)\n",
+ "lsn" LSN_FMT " (%d)\n",
(uint) rec.type, (rec.type !=LOGREC_FIXED_RECORD_0LSN_EXAMPLE),
(uint) rec.short_trid, (rec.short_trid != 0),
(uint) rec.record_length, (rec.record_length != 6),
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc
index 20bb672868d..69301390003 100644
--- a/storage/myisam/ha_myisam.cc
+++ b/storage/myisam/ha_myisam.cc
@@ -340,8 +340,8 @@ int table2myisam(TABLE *table_arg, MI_KEYDEF **keydef_out,
}
}
}
- DBUG_PRINT("loop", ("found: 0x%lx recpos: %d minpos: %d length: %d",
- (long) found, recpos, minpos, length));
+ DBUG_PRINT("loop", ("found: %p recpos: %d minpos: %d length: %d",
+ found, recpos, minpos, length));
if (recpos != minpos)
{
/* reserve space for null bits */
diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c
index 71ab372f2aa..8fd2bf74ccb 100644
--- a/storage/myisam/mi_check.c
+++ b/storage/myisam/mi_check.c
@@ -2916,8 +2916,8 @@ int mi_repair_parallel(HA_CHECK *param, register MI_INFO *info,
*/
sort_param[i].read_cache= ((rep_quick || !i) ? param->read_cache :
new_data_cache);
- DBUG_PRINT("io_cache_share", ("thread: %u read_cache: 0x%lx",
- i, (long) &sort_param[i].read_cache));
+ DBUG_PRINT("io_cache_share", ("thread: %u read_cache: %p",
+ i, &sort_param[i].read_cache));
/*
two approaches: the same amount of memory for each thread
diff --git a/storage/myisam/mi_close.c b/storage/myisam/mi_close.c
index f0a82bcef04..ad1d3074a27 100644
--- a/storage/myisam/mi_close.c
+++ b/storage/myisam/mi_close.c
@@ -27,8 +27,8 @@ int mi_close(register MI_INFO *info)
int error=0,flag;
MYISAM_SHARE *share=info->s;
DBUG_ENTER("mi_close");
- DBUG_PRINT("enter",("base: 0x%lx reopen: %u locks: %u",
- (long) info, (uint) share->reopen,
+ DBUG_PRINT("enter",("base: %p reopen: %u locks: %u",
+ info, (uint) share->reopen,
(uint) share->tot_locks));
if (info->open_list.data)
diff --git a/storage/myisam/mi_delete.c b/storage/myisam/mi_delete.c
index 99185844b72..92b368d92dc 100644
--- a/storage/myisam/mi_delete.c
+++ b/storage/myisam/mi_delete.c
@@ -410,8 +410,8 @@ static int del(register MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *key,
MYISAM_SHARE *share=info->s;
MI_KEY_PARAM s_temp;
DBUG_ENTER("del");
- DBUG_PRINT("enter",("leaf_page: %ld keypos: 0x%lx", (long) leaf_page,
- (ulong) keypos));
+ DBUG_PRINT("enter",("leaf_page: %lld keypos: %p", leaf_page,
+ keypos));
DBUG_DUMP("leaf_buff",(uchar*) leaf_buff,mi_getint(leaf_buff));
endpos=leaf_buff+mi_getint(leaf_buff);
@@ -516,8 +516,8 @@ static int underflow(register MI_INFO *info, register MI_KEYDEF *keyinfo,
MI_KEY_PARAM s_temp;
MYISAM_SHARE *share=info->s;
DBUG_ENTER("underflow");
- DBUG_PRINT("enter",("leaf_page: %ld keypos: 0x%lx",(long) leaf_page,
- (ulong) keypos));
+ DBUG_PRINT("enter",("leaf_page: %lld keypos: %p",leaf_page,
+ keypos));
DBUG_DUMP("anc_buff",(uchar*) anc_buff,mi_getint(anc_buff));
DBUG_DUMP("leaf_buff",(uchar*) leaf_buff,mi_getint(leaf_buff));
@@ -597,8 +597,8 @@ static int underflow(register MI_INFO *info, register MI_KEYDEF *keyinfo,
else
{ /* Page is full */
endpos=anc_buff+anc_length;
- DBUG_PRINT("test",("anc_buff: 0x%lx endpos: 0x%lx",
- (long) anc_buff, (long) 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;
@@ -776,7 +776,7 @@ static uint remove_key(MI_KEYDEF *keyinfo, uint nod_flag,
int s_length;
uchar *start;
DBUG_ENTER("remove_key");
- DBUG_PRINT("enter",("keypos: 0x%lx page_end: 0x%lx",(long) keypos, (long) page_end));
+ DBUG_PRINT("enter",("keypos: %p page_end: %p",keypos, page_end));
start=keypos;
if (!(keyinfo->flag &
diff --git a/storage/myisam/mi_dynrec.c b/storage/myisam/mi_dynrec.c
index 5241d72014c..c4baca3d89f 100644
--- a/storage/myisam/mi_dynrec.c
+++ b/storage/myisam/mi_dynrec.c
@@ -1344,8 +1344,8 @@ ulong _mi_rec_unpack(register MI_INFO *info, register uchar *to, uchar *from,
err:
my_errno= HA_ERR_WRONG_IN_RECORD;
- DBUG_PRINT("error",("to_end: 0x%lx -> 0x%lx from_end: 0x%lx -> 0x%lx",
- (long) to, (long) to_end, (long) from, (long) from_end));
+ DBUG_PRINT("error",("to_end: %p -> %p from_end: %p -> %p",
+ to, to_end, from, from_end));
DBUG_DUMP("from",(uchar*) info->rec_buff,info->s->base.min_pack_length);
DBUG_RETURN(MY_FILE_ERROR);
} /* _mi_rec_unpack */
diff --git a/storage/myisam/mi_rkey.c b/storage/myisam/mi_rkey.c
index b70922b0505..1dddb8b49ad 100644
--- a/storage/myisam/mi_rkey.c
+++ b/storage/myisam/mi_rkey.c
@@ -32,8 +32,8 @@ int mi_rkey(MI_INFO *info, uchar *buf, int inx, const uchar *key,
uint pack_key_length, use_key_length, nextflag;
ICP_RESULT res= ICP_NO_MATCH;
DBUG_ENTER("mi_rkey");
- DBUG_PRINT("enter", ("base: 0x%lx buf: 0x%lx inx: %d search_flag: %d",
- (long) info, (long) buf, inx, search_flag));
+ DBUG_PRINT("enter", ("base: %p buf: %p inx: %d search_flag: %d",
+ info, buf, inx, search_flag));
if ((inx = _mi_check_index(info,inx)) < 0)
DBUG_RETURN(my_errno);
diff --git a/storage/myisam/mi_search.c b/storage/myisam/mi_search.c
index 60a34c641ad..79ed846ce7e 100644
--- a/storage/myisam/mi_search.c
+++ b/storage/myisam/mi_search.c
@@ -267,8 +267,8 @@ int _mi_seq_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page,
mi_print_error(info->s, HA_ERR_CRASHED);
my_errno=HA_ERR_CRASHED;
DBUG_PRINT("error",
- ("Found wrong key: length: %u page: 0x%lx end: 0x%lx",
- length, (long) page, (long) end));
+ ("Found wrong key: length: %u page: %p end: %p",
+ length, page, end));
DBUG_RETURN(MI_FOUND_WRONG_KEY);
}
if ((flag=ha_key_cmp(keyinfo->seg,t_buff,key,key_len,comp_flag,
@@ -284,7 +284,7 @@ int _mi_seq_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page,
if (flag == 0)
memcpy(buff,t_buff,length); /* Result is first key */
*last_key= page == end;
- DBUG_PRINT("exit",("flag: %d ret_pos: 0x%lx", flag, (long) *ret_pos));
+ DBUG_PRINT("exit",("flag: %d ret_pos: %p", flag, *ret_pos));
DBUG_RETURN(flag);
} /* _mi_seq_search */
@@ -419,8 +419,8 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page,
mi_print_error(info->s, HA_ERR_CRASHED);
my_errno=HA_ERR_CRASHED;
DBUG_PRINT("error",
- ("Found wrong key: length: %u page: 0x%lx end: %lx",
- length, (long) page, (long) end));
+ ("Found wrong key: length: %u page: %p end: %p",
+ length, page, end));
DBUG_RETURN(MI_FOUND_WRONG_KEY);
}
@@ -554,7 +554,7 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page,
*last_key= page == end;
- DBUG_PRINT("exit",("flag: %d ret_pos: 0x%lx", flag, (long) *ret_pos));
+ DBUG_PRINT("exit",("flag: %d ret_pos: %p", flag, *ret_pos));
DBUG_RETURN(flag);
} /* _mi_prefix_search */
@@ -816,8 +816,8 @@ uint _mi_get_pack_key(register MI_KEYDEF *keyinfo, uint nod_flag,
if (length > keyseg->length)
{
DBUG_PRINT("error",
- ("Found too long null packed key: %u of %u at 0x%lx",
- length, keyseg->length, (long) *page_pos));
+ ("Found too long null packed key: %u of %u at %p",
+ length, keyseg->length, *page_pos));
DBUG_DUMP("key", *page_pos, 16);
mi_print_error(keyinfo->share, HA_ERR_CRASHED);
my_errno=HA_ERR_CRASHED;
@@ -873,8 +873,8 @@ uint _mi_get_pack_key(register MI_KEYDEF *keyinfo, uint nod_flag,
}
if (length > (uint) keyseg->length)
{
- DBUG_PRINT("error",("Found too long packed key: %u of %u at 0x%lx",
- length, keyseg->length, (long) *page_pos));
+ DBUG_PRINT("error",("Found too long packed key: %u of %u at %p",
+ length, keyseg->length, *page_pos));
DBUG_DUMP("key", *page_pos, 16);
mi_print_error(keyinfo->share, HA_ERR_CRASHED);
my_errno=HA_ERR_CRASHED;
@@ -945,8 +945,8 @@ uint _mi_get_binary_pack_key(register MI_KEYDEF *keyinfo, uint nod_flag,
if (length > keyinfo->maxlength)
{
DBUG_PRINT("error",
- ("Found too long binary packed key: %u of %u at 0x%lx",
- length, keyinfo->maxlength, (long) *page_pos));
+ ("Found too long binary packed key: %u of %u at %p",
+ length, keyinfo->maxlength, *page_pos));
DBUG_DUMP("key", *page_pos, 16);
goto crashed; /* Wrong key */
}
@@ -1003,8 +1003,8 @@ uint _mi_get_binary_pack_key(register MI_KEYDEF *keyinfo, uint nod_flag,
length-=tmp;
from=page; from_end=page_end;
}
- DBUG_PRINT("info",("key: 0x%lx from: 0x%lx length: %u",
- (long) key, (long) from, length));
+ DBUG_PRINT("info",("key: %p from: %p length: %u",
+ key, from, length));
memmove((uchar*) key, (uchar*) from, (size_t) length);
key+=length;
from+=length;
@@ -1077,7 +1077,7 @@ uchar *_mi_get_key(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *page,
}
}
}
- DBUG_PRINT("exit",("page: 0x%lx length: %u", (long) page,
+ DBUG_PRINT("exit",("page: %p length: %u", page,
*return_key_length));
DBUG_RETURN(page);
} /* _mi_get_key */
@@ -1130,8 +1130,8 @@ uchar *_mi_get_last_key(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *page,
uint nod_flag;
uchar *lastpos;
DBUG_ENTER("_mi_get_last_key");
- DBUG_PRINT("enter",("page: 0x%lx endpos: 0x%lx", (long) page,
- (long) endpos));
+ DBUG_PRINT("enter",("page:%p endpos: %p", page,
+ endpos));
nod_flag=mi_test_if_nod(page);
if (! (keyinfo->flag & (HA_VAR_LENGTH_KEY | HA_BINARY_PACK_KEY)))
@@ -1151,15 +1151,15 @@ uchar *_mi_get_last_key(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *page,
*return_key_length=(*keyinfo->get_key)(keyinfo,nod_flag,&page,lastkey);
if (*return_key_length == 0)
{
- DBUG_PRINT("error",("Couldn't find last key: page: 0x%lx",
- (long) page));
+ DBUG_PRINT("error",("Couldn't find last key: page: %p",
+ page));
mi_print_error(info->s, HA_ERR_CRASHED);
my_errno=HA_ERR_CRASHED;
DBUG_RETURN(0);
}
}
}
- DBUG_PRINT("exit",("lastpos: 0x%lx length: %u", (long) lastpos,
+ DBUG_PRINT("exit",("lastpos: %p length: %u", lastpos,
*return_key_length));
DBUG_RETURN(lastpos);
} /* _mi_get_last_key */
@@ -1245,9 +1245,9 @@ int _mi_search_next(register MI_INFO *info, register MI_KEYDEF *keyinfo,
uint nod_flag;
uchar lastkey[HA_MAX_KEY_BUFF];
DBUG_ENTER("_mi_search_next");
- DBUG_PRINT("enter",("nextflag: %u lastpos: %lu int_keypos: %lu",
- nextflag, (ulong) info->lastpos,
- (ulong) info->int_keypos));
+ DBUG_PRINT("enter",("nextflag: %u lastpos: %llu int_keypos: %p",
+ nextflag, info->lastpos,
+ info->int_keypos));
DBUG_EXECUTE("key",_mi_print_key(DBUG_FILE,keyinfo->seg,key,key_length););
/* Force full read if we are at last key or if we are not on a leaf
@@ -1697,8 +1697,8 @@ _mi_calc_var_pack_key_length(MI_KEYDEF *keyinfo,uint nod_flag,uchar *next_key,
ref_length=0;
next_length_pack=0;
}
- DBUG_PRINT("test",("length: %d next_key: 0x%lx", length,
- (long) next_key));
+ DBUG_PRINT("test",("length: %d next_key: %p", length,
+ next_key));
{
uint tmp_length;
diff --git a/storage/myisam/mi_write.c b/storage/myisam/mi_write.c
index ff12f335af1..3ba25d84e62 100644
--- a/storage/myisam/mi_write.c
+++ b/storage/myisam/mi_write.c
@@ -471,7 +471,7 @@ int _mi_insert(register MI_INFO *info, register MI_KEYDEF *keyinfo,
uchar *endpos, *prev_key;
MI_KEY_PARAM s_temp;
DBUG_ENTER("_mi_insert");
- DBUG_PRINT("enter",("key_pos: 0x%lx", (long) 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);
@@ -492,8 +492,8 @@ int _mi_insert(register MI_INFO *info, register MI_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_pos: 0x%lx",
- s_temp.n_ref_length,s_temp.n_length, (long) s_temp.key));
+ 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
if (t_length > 0)
@@ -693,8 +693,8 @@ uchar *_mi_find_half_pos(uint nod_flag, MI_KEYDEF *keyinfo, uchar *page,
} while (page < end);
*return_key_length=length;
*after_key=page;
- DBUG_PRINT("exit",("returns: 0x%lx page: 0x%lx half: 0x%lx",
- (long) lastpos, (long) page, (long) end));
+ DBUG_PRINT("exit",("returns: %p page: %p half: %p",
+ lastpos, page, end));
DBUG_RETURN(lastpos);
} /* _mi_find_half_pos */
@@ -750,8 +750,8 @@ static uchar *_mi_find_last_pos(MI_KEYDEF *keyinfo, uchar *page,
*return_key_length=last_length;
*after_key=lastpos;
- DBUG_PRINT("exit",("returns: 0x%lx page: 0x%lx end: 0x%lx",
- (long) prevpos,(long) page,(long) end));
+ DBUG_PRINT("exit",("returns: %p page: %p end: %p",
+ prevpos, page, end));
DBUG_RETURN(prevpos);
} /* _mi_find_last_pos */
diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc
index 3d91aa67793..93b6e08eda8 100644
--- a/storage/myisammrg/ha_myisammrg.cc
+++ b/storage/myisammrg/ha_myisammrg.cc
@@ -359,7 +359,7 @@ int ha_myisammrg::open(const char *name, int mode __attribute__((unused)),
uint test_if_locked_arg)
{
DBUG_ENTER("ha_myisammrg::open");
- DBUG_PRINT("myrg", ("name: '%s' table: 0x%lx", name, (long) table));
+ DBUG_PRINT("myrg", ("name: '%s' table: %p", name, table));
DBUG_PRINT("myrg", ("test_if_locked_arg: %u", test_if_locked_arg));
/* Must not be used when table is open. */
@@ -413,8 +413,8 @@ int ha_myisammrg::open(const char *name, int mode __attribute__((unused)),
DBUG_RETURN(my_errno ? my_errno : -1);
/* purecov: end */
}
- DBUG_PRINT("myrg", ("MYRG_INFO: 0x%lx child tables: %u",
- (long) file, file->tables));
+ DBUG_PRINT("myrg", ("MYRG_INFO: %p child tables: %u",
+ file, file->tables));
DBUG_RETURN(0);
}
@@ -440,8 +440,8 @@ int ha_myisammrg::add_children_list(void)
List_iterator_fast<Mrg_child_def> it(child_def_list);
Mrg_child_def *mrg_child_def;
DBUG_ENTER("ha_myisammrg::add_children_list");
- DBUG_PRINT("myrg", ("table: '%s'.'%s' 0x%lx", this->table->s->db.str,
- this->table->s->table_name.str, (long) this->table));
+ DBUG_PRINT("myrg", ("table: '%s'.'%s' %p", this->table->s->db.str,
+ this->table->s->table_name.str, this->table));
/* Must call this with open table. */
DBUG_ASSERT(this->file);
@@ -699,12 +699,12 @@ extern "C" MI_INFO *myisammrg_attach_children_callback(void *callback_param)
if ((child->file->ht->db_type != DB_TYPE_MYISAM) ||
!(myisam= ((ha_myisam*) child->file)->file_ptr()))
{
- DBUG_PRINT("error", ("no MyISAM handle for child table: '%s'.'%s' 0x%lx",
+ DBUG_PRINT("error", ("no MyISAM handle for child table: '%s'.'%s' %p",
child->s->db.str, child->s->table_name.str,
- (long) child));
+ child));
}
- DBUG_PRINT("myrg", ("MyISAM handle: 0x%lx", (long) myisam));
+ DBUG_PRINT("myrg", ("MyISAM handle: %p", myisam));
end:
@@ -810,8 +810,8 @@ int ha_myisammrg::attach_children(void)
int error;
Mrg_attach_children_callback_param param(parent_l, this->children_l, child_def_list);
DBUG_ENTER("ha_myisammrg::attach_children");
- DBUG_PRINT("myrg", ("table: '%s'.'%s' 0x%lx", table->s->db.str,
- table->s->table_name.str, (long) table));
+ DBUG_PRINT("myrg", ("table: '%s'.'%s' %p", table->s->db.str,
+ table->s->table_name.str, table));
DBUG_PRINT("myrg", ("test_if_locked: %u", this->test_if_locked));
/* Must call this with open table. */
diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc
index 9868bbc926d..ec69b5a8848 100644
--- a/storage/rocksdb/ha_rocksdb.cc
+++ b/storage/rocksdb/ha_rocksdb.cc
@@ -3239,14 +3239,14 @@ static bool rocksdb_show_status(handlerton *const hton, THD *const thd,
// NB! We're replacing hyphens with underscores in output to better match
// the existing naming convention.
if (rdb->GetIntProperty("rocksdb.is-write-stopped", &v)) {
- snprintf(buf, sizeof(buf), "rocksdb.is_write_stopped COUNT : %lu\n", v);
+ snprintf(buf, sizeof(buf), "rocksdb.is_write_stopped COUNT : %llu\n", (ulonglong)v);
str.append(buf);
}
if (rdb->GetIntProperty("rocksdb.actual-delayed-write-rate", &v)) {
snprintf(buf, sizeof(buf), "rocksdb.actual_delayed_write_rate "
- "COUNT : %lu\n",
- v);
+ "COUNT : %llu\n",
+ (ulonglong)v);
str.append(buf);
}
@@ -4178,7 +4178,7 @@ std::vector<std::string> rdb_get_open_table_names(void) {
}
std::vector<std::string> Rdb_open_tables_map::get_table_names(void) const {
- ulong i;
+ size_t i;
const Rdb_table_handler *table_handler;
std::vector<std::string> names;
diff --git a/vio/vio.c b/vio/vio.c
index 2c5f37a75a4..34ca9ed872d 100644
--- a/vio/vio.c
+++ b/vio/vio.c
@@ -80,7 +80,7 @@ static void vio_init(Vio *vio, enum enum_vio_type type,
my_socket sd, uint flags)
{
DBUG_ENTER("vio_init");
- DBUG_PRINT("enter", ("type: %d sd: %d flags: %d", type, sd, flags));
+ DBUG_PRINT("enter", ("type: %d sd: %d flags: %d", type, (int)sd, flags));
#ifndef HAVE_VIO_READ_BUFF
flags&= ~VIO_BUFFERED_READ;
@@ -249,7 +249,7 @@ Vio *mysql_socket_vio_new(MYSQL_SOCKET mysql_socket, enum enum_vio_type type, ui
Vio *vio;
my_socket sd= mysql_socket_getfd(mysql_socket);
DBUG_ENTER("mysql_socket_vio_new");
- DBUG_PRINT("enter", ("sd: %d", sd));
+ DBUG_PRINT("enter", ("sd: %d", (int)sd));
if ((vio = (Vio*) my_malloc(sizeof(*vio),MYF(MY_WME))))
{
vio_init(vio, type, sd, flags);
@@ -266,7 +266,7 @@ Vio *vio_new(my_socket sd, enum enum_vio_type type, uint flags)
Vio *vio;
MYSQL_SOCKET mysql_socket= MYSQL_INVALID_SOCKET;
DBUG_ENTER("vio_new");
- DBUG_PRINT("enter", ("sd: %d", sd));
+ DBUG_PRINT("enter", ("sd: %d", (int)sd));
mysql_socket_setfd(&mysql_socket, sd);
vio = mysql_socket_vio_new(mysql_socket, type, flags);
diff --git a/vio/viosocket.c b/vio/viosocket.c
index 074948badec..cb353c1ce75 100644
--- a/vio/viosocket.c
+++ b/vio/viosocket.c
@@ -145,9 +145,9 @@ size_t vio_read(Vio *vio, uchar *buf, size_t size)
ssize_t ret;
int flags= 0;
DBUG_ENTER("vio_read");
- DBUG_PRINT("enter", ("sd: %d buf: %p size: %d",
- mysql_socket_getfd(vio->mysql_socket), buf,
- (int) size));
+ DBUG_PRINT("enter", ("sd: %d buf: %p size: %zu",
+ (int)mysql_socket_getfd(vio->mysql_socket), buf,
+ size));
/* Ensure nobody uses vio_read_buff and vio_read simultaneously. */
DBUG_ASSERT(vio->read_end == vio->read_pos);
@@ -212,9 +212,9 @@ size_t vio_read_buff(Vio *vio, uchar* buf, size_t size)
size_t rc;
#define VIO_UNBUFFERED_READ_MIN_SIZE 2048
DBUG_ENTER("vio_read_buff");
- DBUG_PRINT("enter", ("sd: %d buf: %p size: %d",
- mysql_socket_getfd(vio->mysql_socket),
- buf, (int) size));
+ DBUG_PRINT("enter", ("sd: %d buf: %p size:%zu",
+ (int)mysql_socket_getfd(vio->mysql_socket),
+ buf, size));
if (vio->read_pos < vio->read_end)
{
@@ -259,9 +259,9 @@ size_t vio_write(Vio *vio, const uchar* buf, size_t size)
ssize_t ret;
int flags= 0;
DBUG_ENTER("vio_write");
- DBUG_PRINT("enter", ("sd: %d buf: %p size: %d",
- mysql_socket_getfd(vio->mysql_socket), buf,
- (int) size));
+ DBUG_PRINT("enter", ("sd: %d buf: %p size: %zu",
+ (int)mysql_socket_getfd(vio->mysql_socket), buf,
+ size));
/* If timeout is enabled, do not block. */
if (vio->write_timeout >= 0)
@@ -509,7 +509,7 @@ int vio_keepalive(Vio* vio, my_bool set_keep_alive)
uint opt = 0;
DBUG_ENTER("vio_keepalive");
DBUG_PRINT("enter", ("sd: %d set_keep_alive: %d",
- mysql_socket_getfd(vio->mysql_socket),
+ (int)mysql_socket_getfd(vio->mysql_socket),
(int)set_keep_alive));
if (vio->type != VIO_TYPE_NAMEDPIPE && vio->type != VIO_TYPE_SHARED_MEMORY)
@@ -563,7 +563,7 @@ int vio_close(Vio *vio)
{
int r=0;
DBUG_ENTER("vio_close");
- DBUG_PRINT("enter", ("sd: %d", mysql_socket_getfd(vio->mysql_socket)));
+ DBUG_PRINT("enter", ("sd: %d", (int)mysql_socket_getfd(vio->mysql_socket)));
if (vio->type != VIO_CLOSED)
{
diff --git a/vio/viossl.c b/vio/viossl.c
index 0bc2c263336..e7cc85ea539 100644
--- a/vio/viossl.c
+++ b/vio/viossl.c
@@ -136,8 +136,8 @@ size_t vio_ssl_read(Vio *vio, uchar *buf, size_t size)
int ret;
SSL *ssl= vio->ssl_arg;
DBUG_ENTER("vio_ssl_read");
- DBUG_PRINT("enter", ("sd: %d buf: %p size: %d ssl: %p",
- mysql_socket_getfd(vio->mysql_socket), buf, (int) size,
+ DBUG_PRINT("enter", ("sd: %d buf: %p size: %zu ssl: %p",
+ (int)mysql_socket_getfd(vio->mysql_socket), buf, size,
vio->ssl_arg));
if (vio->async_context && vio->async_context->active)
@@ -168,9 +168,9 @@ size_t vio_ssl_write(Vio *vio, const uchar *buf, size_t size)
int ret;
SSL *ssl= vio->ssl_arg;
DBUG_ENTER("vio_ssl_write");
- DBUG_PRINT("enter", ("sd: %d buf: %p size: %d",
- mysql_socket_getfd(vio->mysql_socket),
- buf, (int) size));
+ DBUG_PRINT("enter", ("sd: %d buf: %p size: %zu",
+ (int)mysql_socket_getfd(vio->mysql_socket),
+ buf, size));
if (vio->async_context && vio->async_context->active)
ret= my_ssl_write_async(vio->async_context, (SSL *)vio->ssl_arg, buf,
@@ -319,8 +319,8 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
my_bool was_blocking;
my_socket sd= mysql_socket_getfd(vio->mysql_socket);
DBUG_ENTER("ssl_do");
- DBUG_PRINT("enter", ("ptr: 0x%lx, sd: %d ctx: 0x%lx",
- (long) ptr, sd, (long) ptr->ssl_context));
+ DBUG_PRINT("enter", ("ptr: %p, sd: %d ctx: %p",
+ ptr, (int)sd, ptr->ssl_context));
/* Set socket to blocking if not already set */
vio_blocking(vio, 1, &was_blocking);
@@ -332,7 +332,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
vio_blocking(vio, was_blocking, &unused);
DBUG_RETURN(1);
}
- DBUG_PRINT("info", ("ssl: 0x%lx timeout: %ld", (long) ssl, timeout));
+ DBUG_PRINT("info", ("ssl: %p timeout: %ld", ssl, timeout));
SSL_clear(ssl);
SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout);
SSL_set_fd(ssl, sd);
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c
index 71ef2879464..6358b976e16 100644
--- a/vio/viosslfactories.c
+++ b/vio/viosslfactories.c
@@ -100,8 +100,8 @@ vio_set_cert_stuff(SSL_CTX *ctx, const char *cert_file, const char *key_file,
enum enum_ssl_init_error* error)
{
DBUG_ENTER("vio_set_cert_stuff");
- DBUG_PRINT("enter", ("ctx: 0x%lx cert_file: %s key_file: %s",
- (long) ctx, cert_file, key_file));
+ DBUG_PRINT("enter", ("ctx: %p cert_file: %s key_file: %s",
+ ctx, cert_file, key_file));
if (!cert_file && key_file)
cert_file= key_file;