diff options
| author | Michael Widenius <monty@mysql.com> | 2010-11-30 23:11:03 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2010-11-30 23:11:03 +0200 |
| commit | 1e5061fe3be981d6f685a2865fd1e2bcd3fcc23a (patch) | |
| tree | a0c58838a4dd7bdf2ed4d739563da27727ada7b0 /include/my_pthread.h | |
| parent | b2e979d868d5d5964d58c97ed9580e07f6123217 (diff) | |
| parent | 6f279f40145624c1ffab06c63521f96ce4ac3a02 (diff) | |
| download | mariadb-git-1e5061fe3be981d6f685a2865fd1e2bcd3fcc23a.tar.gz | |
merge with 5.1
Diffstat (limited to 'include/my_pthread.h')
| -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 f7aad5dec64..169225c1e9b 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -517,7 +517,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); void safe_mutex_free_deadlock_data(safe_mutex_t *mp); |