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 | 785bcc173de480cde88081c9b054ee8de72cd1ad (patch) | |
| tree | 8a7eb61812d8e109fee0ee56d3628ea17b919f61 /mysys/thr_mutex.c | |
| parent | 7af5094208edac1dd3af9ba2883f3c91264fbf6a (diff) | |
| parent | b5bb13ec0380624c2e663a4e9b4b29fe574b3e05 (diff) | |
| download | mariadb-git-785bcc173de480cde88081c9b054ee8de72cd1ad.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.
Diffstat (limited to 'mysys/thr_mutex.c')
| -rw-r--r-- | mysys/thr_mutex.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/thr_mutex.c b/mysys/thr_mutex.c index db35d5a13a6..00890bc0425 100644 --- a/mysys/thr_mutex.c +++ b/mysys/thr_mutex.c @@ -262,8 +262,8 @@ int safe_cond_wait(pthread_cond_t *cond, safe_mutex_t *mp, const char *file, 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) { int error; pthread_mutex_lock(&mp->global); |