mirror of
https://github.com/MariaDB/server.git
synced 2026-05-05 22:55:32 +02:00
Cleanup of checking of user resources
Added missing checking of no_keyread Docs/manual.texi: Fixed wrong example myisam/myisamchk.c: Removed not needed include file mysys/my_pthread.c: Fix for HPUX mysys/my_thr_init.c: Removed not needed warning scripts/mysql_fix_privilege_tables.sh: Cleanup sql/sql_lex.cc: Removed not needed initialization sql/sql_parse.cc: Cleanup of checking of user resources sql/sql_select.cc: Added checking of no_keyread
This commit is contained in:
parent
c554eeec98
commit
8a8e4be22f
8 changed files with 35 additions and 37 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue