mirror of
https://github.com/MariaDB/server.git
synced 2025-07-16 00:42:55 +03:00
References lp:1034621 - Merge up to mysql-5.5.25 level
merged codership-mysql/5.5 revisions: bzr diff -r3759..3767 merged codership-mysql/5.5 revisions: bzr diff -r3768..3771
This commit is contained in:
@ -2785,9 +2785,6 @@ pthread_handler_t handle_delayed_insert(void *arg)
|
||||
{
|
||||
int error;
|
||||
mysql_audit_release(thd);
|
||||
#if defined(HAVE_BROKEN_COND_TIMEDWAIT)
|
||||
error= mysql_cond_wait(&di->cond, &di->mutex);
|
||||
#else
|
||||
error= mysql_cond_timedwait(&di->cond, &di->mutex, &abstime);
|
||||
#ifdef EXTRA_DEBUG
|
||||
if (error && error != EINTR && error != ETIMEDOUT)
|
||||
@ -2796,7 +2793,6 @@ pthread_handler_t handle_delayed_insert(void *arg)
|
||||
DBUG_PRINT("error", ("Got error %d from mysql_cond_timedwait",
|
||||
error));
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
if (error == ETIMEDOUT || error == ETIME)
|
||||
thd->killed= KILL_CONNECTION;
|
||||
|
Reference in New Issue
Block a user