summaryrefslogtreecommitdiff
path: root/sql/sql_insert.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-07-31 19:29:07 +0200
committerSergei Golubchik <sergii@pisem.net>2012-07-31 19:29:07 +0200
commit0117a92fedc2e5294682127d54034af5b3f96c8e (patch)
tree0c075a3fa43f64a3895acc704bacf69a96afda14 /sql/sql_insert.cc
parent42ea25d4c51b5466b4b03a29abe480e763732cf2 (diff)
downloadmariadb-git-0117a92fedc2e5294682127d54034af5b3f96c8e.tar.gz
MDEV-419 ensure that all HAVE_XXX constants can be set by cmake
add missing checks to configure.cmake remove dead code and unused HAVE_xxx constants from the sources
Diffstat (limited to 'sql/sql_insert.cc')
-rw-r--r--sql/sql_insert.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 54f94ce78c1..e0d0d4c4223 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -2781,9 +2781,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)
@@ -2793,7 +2790,6 @@ pthread_handler_t handle_delayed_insert(void *arg)
error));
}
#endif
-#endif
if (error == ETIMEDOUT || error == ETIME)
thd->killed= KILL_CONNECTION;
}