diff options
| author | monty@hundin.mysql.fi <> | 2001-08-22 01:45:07 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-08-22 01:45:07 +0300 |
| commit | 733f865f54e297bf512f10ec0631342303164b25 (patch) | |
| tree | 32f2629127dea884d1930817179e72d2076be756 /sql/item_func.cc | |
| parent | 063a1a6557ad2c501f4da9a47e633fb191ee2e00 (diff) | |
| download | mariadb-git-733f865f54e297bf512f10ec0631342303164b25.tar.gz | |
Fixes for OS2.
Fix bug in isamlog
Add argument types to function declarations.
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index ef3372629f6..989d7709513 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -1489,8 +1489,14 @@ longlong Item_func_get_lock::val_int() thd->mysys_var->current_cond= &ull->cond; pthread_mutex_unlock(&thd->mysys_var->mutex); +#ifdef HAVE_TIMESPEC_TS_SEC + abstime.ts_sec=time((time_t*) 0)+(time_t) timeout; + abstime.ts_nsec=0; +#else abstime.tv_sec=time((time_t*) 0)+(time_t) timeout; abstime.tv_nsec=0; +#endif + while ((error=pthread_cond_timedwait(&ull->cond,&LOCK_user_locks,&abstime)) != ETIME && error != ETIMEDOUT && ull->locked) { |