diff options
| author | unknown <konstantin@mysql.com> | 2005-07-14 19:42:56 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-07-14 19:42:56 +0400 |
| commit | e4f2bd469fffe87aa18dd93c221cc424a4da82f6 (patch) | |
| tree | e160ac8703afc6d52b39d0579b2f10fedbef7bd2 /sql/sql_insert.cc | |
| parent | 20d8170adc735d49acc95981845ebd0844c00653 (diff) | |
| download | mariadb-git-e4f2bd469fffe87aa18dd93c221cc424a4da82f6.tar.gz | |
Get rid of checking for ETIME return value of pthread_cond_timedwait.
ETIME was returned by cond_timedwait (sic, the pre-POSIX1001b function) on
Solaris 2.6 and 2.7. pthread_cond_timedwait on Solaris returns ETIMEDOUT.
The standard requirement is that the only additional return value
of pthred_cond_timedwait compared to pthread_cond_wait is ETIMEDOUT.
Let us not bloat the application code with redundant checks,
and if we're ever to work on a platform that returns a non-standard
value, we should write a wrapper for that platform (like we do, e.g., for
Windows).
mysys/my_os2cond.c:
- fix our implementation of pthread_cond_timedwait on OS2 to return
ETIMEDOUT instead of ETIME.
sql/item_func.cc:
- don't check for ETIME
sql/slave.cc:
- don't check for ETIME
sql/sql_insert.cc:
- don't check for ETIME
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 5d30cad2926..125390e4411 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1730,7 +1730,7 @@ extern "C" pthread_handler_decl(handle_delayed_insert,arg) #endif if (thd->killed || di->status) break; - if (error == ETIME || error == ETIMEDOUT) + if (error == ETIMEDOUT) { thd->killed= THD::KILL_CONNECTION; break; |