From 63819ccb34409d6d3867508ac2f0e328d56a7ea5 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Wed, 6 Nov 2013 10:22:00 +0100 Subject: Bug#17702677 WRONG INSTRUMENTATION INTERFACE FOR MYSQL_COND_TIMEDWAIT The pthread_cond_timedwait(3P) api uses a const struct timespec for parameter 3. The instrumentation api for the same, mysql_cond_timedwait, which expands to inline_mysql_cond_timedwait, should also take a const parameter for the timespec. This fix add the missing const to inline_mysql_cond_timedwait. --- include/mysql/psi/mysql_thread.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/mysql/psi/mysql_thread.h b/include/mysql/psi/mysql_thread.h index 5b8ea3dc5dc..6292cbc2700 100644 --- a/include/mysql/psi/mysql_thread.h +++ b/include/mysql/psi/mysql_thread.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -988,7 +988,7 @@ static inline int inline_mysql_cond_wait( static inline int inline_mysql_cond_timedwait( mysql_cond_t *that, mysql_mutex_t *mutex, - struct timespec *abstime + const struct timespec *abstime #ifdef HAVE_PSI_INTERFACE , const char *src_file, uint src_line #endif -- cgit v1.2.1