summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2003-10-16 07:44:18 +0300
committerunknown <monty@mashka.mysql.fi>2003-10-16 07:44:18 +0300
commit0b45b5c63263870780b58498e8ad26713e5b37b7 (patch)
tree0a0ce5aa36cbc4107686a8e97a32a2c148b5c90d
parent0fc97bc9e5c6c0a4f380841b325f6f0647a90bb5 (diff)
downloadmariadb-git-0b45b5c63263870780b58498e8ad26713e5b37b7.tar.gz
Changing max_insert_delayed_threads now also changes the size of thread alarm buffer.
-rw-r--r--sql/set_var.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc
index fbcc341f128..03651967a7a 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -47,6 +47,7 @@
#include "slave.h"
#include "sql_acl.h"
#include <my_getopt.h>
+#include <thr_alarm.h>
#include <myisam.h>
#ifdef HAVE_BERKELEY_DB
#include "ha_berkeley.h"
@@ -153,7 +154,8 @@ sys_var_long_ptr sys_max_connections("max_connections",
sys_var_long_ptr sys_max_connect_errors("max_connect_errors",
&max_connect_errors);
sys_var_long_ptr sys_max_delayed_threads("max_delayed_threads",
- &max_insert_delayed_threads);
+ &max_insert_delayed_threads,
+ fix_max_connections);
sys_var_thd_ulong sys_max_heap_table_size("max_heap_table_size",
&SV::max_heap_table_size);
sys_var_thd_ha_rows sys_max_join_size("max_join_size",
@@ -753,13 +755,13 @@ static void fix_max_relay_log_size(THD *thd, enum_var_type type)
DBUG_VOID_RETURN;
}
-#include <thr_alarm.h>
-static void
-fix_max_connections(THD *thd, enum_var_type type)
+
+static void fix_max_connections(THD *thd, enum_var_type type)
{
- resize_thr_alarm(max_connections);
+ resize_thr_alarm(max_connections + max_insert_delayed_threads + 10);
}
+
bool sys_var_long_ptr::update(THD *thd, set_var *var)
{
ulonglong tmp= var->value->val_int();