diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-10-16 08:11:01 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-10-16 08:11:01 +0300 |
| commit | 48d49976fdecf3cf9a5826abe6e9178c0d3efccb (patch) | |
| tree | 59143b8cb6c36057dc11877353dac9a2735ab255 /sql/set_var.cc | |
| parent | aff45e1b0733947abde48f712c1af64b4f2549a7 (diff) | |
| parent | 0b45b5c63263870780b58498e8ad26713e5b37b7 (diff) | |
| download | mariadb-git-48d49976fdecf3cf9a5826abe6e9178c0d3efccb.tar.gz | |
Merge
sql/set_var.cc:
SCCS merged
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 3100c951f68..582010a4602 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -51,6 +51,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" @@ -168,7 +169,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_error_count("max_error_count", &SV::max_error_count); sys_var_thd_ulong sys_max_heap_table_size("max_heap_table_size", @@ -884,13 +886,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(); |