summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Alff <marc.alff@oracle.com>2013-11-06 10:22:00 +0100
committerMarc Alff <marc.alff@oracle.com>2013-11-06 10:22:00 +0100
commit63819ccb34409d6d3867508ac2f0e328d56a7ea5 (patch)
treeb790d2d180d492a6faebbc106753d9865954a5f2
parent5f83a7fbf8df25b444eedbc88925fe8912b12fd2 (diff)
downloadmariadb-git-63819ccb34409d6d3867508ac2f0e328d56a7ea5.tar.gz
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.
-rw-r--r--include/mysql/psi/mysql_thread.h4
1 files changed, 2 insertions, 2 deletions
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