lots of post-merge changes

1 files changed, 1 insertions, 1 deletions

diff --git a/include/wqueue.h b/include/wqueue.h
index 658f3d66f12..96115c4db3c 100644
--- a/include/wqueue.h
+++ b/include/wqueue.h
@@ -18,7 +18,7 @@ void wqueue_unlink_from_queue(WQUEUE *wqueue, struct st_my_thread_var *thread);
 void wqueue_add_to_queue(WQUEUE *wqueue, struct st_my_thread_var *thread);
 void wqueue_add_and_wait(WQUEUE *wqueue,
                          struct st_my_thread_var *thread,
-                         pthread_mutex_t *lock);
+                         mysql_mutex_t *lock);
 void wqueue_release_queue(WQUEUE *wqueue);
 void wqueue_release_one_locktype_from_queue(WQUEUE *wqueue);