summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
diff options
context:
space:
mode:
authorunknown <paul@ice.snake.net>2004-08-20 13:10:05 -0500
committerunknown <paul@ice.snake.net>2004-08-20 13:10:05 -0500
commit7d3b20e3e42c6edf52dd09f8d25cb569933694ce (patch)
tree2c1f16b80bf2a08981f3704a69d3e8d803bb2a51 /sql/set_var.cc
parent17c0da832810b4c6bccef2852085ac0debda70a8 (diff)
parent8f68a9eb6f62183742d8f37bc5ec94a48e831a5d (diff)
downloadmariadb-git-7d3b20e3e42c6edf52dd09f8d25cb569933694ce.tar.gz
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1 sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r--sql/set_var.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc
index a22af621d89..5351d2d12b2 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -1140,8 +1140,10 @@ static int check_max_delayed_threads(THD *thd, set_var *var)
static void fix_max_connections(THD *thd, enum_var_type type)
{
+#ifndef EMBEDDED_LIBRARY
resize_thr_alarm(max_connections +
global_system_variables.max_insert_delayed_threads + 10);
+#endif
}