diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-10-16 08:23:43 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-10-16 08:23:43 +0300 |
| commit | 8ddb4b7c553508fbf48fb3026909a35bac98d32e (patch) | |
| tree | 31decf9e01ad6c26fd96c6696a5257b74c97fd82 | |
| parent | a49ef9a555bcd3ec5d43298a2decbf1b41b674ff (diff) | |
| parent | 0b45b5c63263870780b58498e8ad26713e5b37b7 (diff) | |
| download | mariadb-git-8ddb4b7c553508fbf48fb3026909a35bac98d32e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
| -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 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(); |