diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-10-20 12:48:19 -0200 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-10-20 12:48:19 -0200 |
| commit | 726d54cbf4c15e1c416e832a91cc389bc3f43ab8 (patch) | |
| tree | 8a7eb61812d8e109fee0ee56d3628ea17b919f61 /include | |
| parent | 69aea87d5f424efc92708a44d0d3753958210610 (diff) | |
| parent | 60f30f690956e8e9066b40bb9e08cdcc66debf06 (diff) | |
| download | mariadb-git-726d54cbf4c15e1c416e832a91cc389bc3f43ab8.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index d3053b4861a..bec88a716fe 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -501,7 +501,8 @@ int safe_mutex_destroy(safe_mutex_t *mp,const char *file, uint line); int safe_cond_wait(pthread_cond_t *cond, safe_mutex_t *mp,const char *file, uint line); int safe_cond_timedwait(pthread_cond_t *cond, safe_mutex_t *mp, - struct timespec *abstime, const char *file, uint line); + const struct timespec *abstime, + const char *file, uint line); void safe_mutex_global_init(void); void safe_mutex_end(FILE *file); |