From 7d0ac3ade7fb9f1276e87faa7099832d01329200 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Mon, 24 Apr 2017 13:02:08 +1000 Subject: [PATCH] MDEV-12488: Remove type mismatch in InnoDB printf-like calls To fix OSX error: /Users/travis/build/grooverdan/mariadb-server/storage/xtradb/sync/sync0arr.cc:530:5: warning: format specifies type 'unsigned long' but the argument has type 'os_thread_id_t' (aka '_opaque_pthread_t *') [-Wformat] mutex->thread_id, ^~~~~~~~~~~~~~~~ Signed-off-by: Daniel Black --- storage/xtradb/sync/sync0arr.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/xtradb/sync/sync0arr.cc b/storage/xtradb/sync/sync0arr.cc index ae8032da167..134d16ae58e 100644 --- a/storage/xtradb/sync/sync0arr.cc +++ b/storage/xtradb/sync/sync0arr.cc @@ -527,7 +527,7 @@ sync_array_cell_print( "waiters flag " ULINTPF "\n", (void*) mutex, mutex->cmutex_name, (ulong) mutex->lock_word, - mutex->thread_id, + os_thread_pf(mutex->thread_id), mutex->file_name, mutex->line, mutex->waiters); }