summaryrefslogtreecommitdiff
path: root/mysys/wqueue.c
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2017-10-02 22:35:13 +0400
committerAlexander Barkov <bar@mariadb.org>2017-10-02 22:35:13 +0400
commit8ae8cd63485eb063de0b70ea6f3acf7102a61fef (patch)
tree70fa448baa769b6c8c331063a61bf929ad61c976 /mysys/wqueue.c
parent6857cb57fe7090f131b272f31485b7a478a0b324 (diff)
parent387bdf07ae0973bc3e4dc3f5064d2a29c64bb769 (diff)
downloadmariadb-git-8ae8cd63485eb063de0b70ea6f3acf7102a61fef.tar.gz
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'mysys/wqueue.c')
-rw-r--r--mysys/wqueue.c14
1 files changed, 7 insertions, 7 deletions
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;