diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-17 09:46:38 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-17 09:46:38 +0300 |
| commit | 19e7bb150fffc487337d9b96cde681e6beb7e9c4 (patch) | |
| tree | c4192ea1dc766c5876a63b0bb65cdd30a84a36e7 /mysys | |
| parent | 83e965bd238f9b9597a6cc5fc274f47e7194f92a (diff) | |
| parent | 3ee08e707afe5d15422a653723cc3563955aa476 (diff) | |
| download | mariadb-git-19e7bb150fffc487337d9b96cde681e6beb7e9c4.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_pthread.c | 7 | ||||
| -rw-r--r-- | mysys/my_thr_init.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index e1345b96627..38451f1f79a 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -426,9 +426,12 @@ int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, { int error=pthread_cond_timedwait(cond, mutex, abstime); if (error == -1) /* Safety if the lib is fixed */ - error=errno; + { + if (!(error=errno)) + error= ETIMEDOUT; /* Can happen on HPUX */ + } if (error == EAGAIN) /* Correct errno to Posix */ - error=ETIMEDOUT; + error= ETIMEDOUT; return error; } #endif diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c index 2bd02ad957f..9f91f7a392d 100644 --- a/mysys/my_thr_init.c +++ b/mysys/my_thr_init.c @@ -123,7 +123,7 @@ my_bool my_thread_init(void) #if !defined(__WIN__) || defined(USE_TLS) if (my_pthread_getspecific(struct st_my_thread_var *,THR_KEY_mysys)) { -#ifdef EXTRA_DEBUG +#ifdef EXTRA_DEBUG_THREADS fprintf(stderr,"my_thread_init() called more than once in thread %ld\n", pthread_self()); #endif |