diff options
| author | unknown <serg@serg.mylan> | 2003-10-06 14:11:16 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-10-06 14:11:16 +0200 |
| commit | 08a08a67dbde78258e46b0d9bcd387c8419b8fcd (patch) | |
| tree | 7bffd47192fc8d22df42f124ba543de3125a5375 /sql | |
| parent | 08504cfe276a2ff53ab34a13250220c28702e03c (diff) | |
| download | mariadb-git-08a08a67dbde78258e46b0d9bcd387c8419b8fcd.tar.gz | |
fix_max_connections to resize alarm_queue (Bug #1435)
include/queues.h:
resize_queue()
include/thr_alarm.h:
resize_thr_alarm() to resize alarm_queue
mysys/queues.c:
resize_queue()
mysys/thr_alarm.c:
resize_thr_alarm() to resize alarm_queue
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/set_var.cc | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 8c0859fbca4..3388fbc1932 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -86,6 +86,7 @@ static void fix_myisam_max_extra_sort_file_size(THD *thd, enum_var_type type); static void fix_myisam_max_sort_file_size(THD *thd, enum_var_type type); static void fix_max_binlog_size(THD *thd, enum_var_type type); static void fix_max_relay_log_size(THD *thd, enum_var_type type); +static void fix_max_connections(THD *thd, enum_var_type type); /* Variable definition list @@ -147,7 +148,8 @@ sys_var_long_ptr sys_max_binlog_size("max_binlog_size", &max_binlog_size, fix_max_binlog_size); sys_var_long_ptr sys_max_connections("max_connections", - &max_connections); + &max_connections, + fix_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", @@ -636,7 +638,7 @@ static void fix_max_join_size(THD *thd, enum_var_type type) thd->options&= ~OPTION_BIG_SELECTS; } } - + /* If one doesn't use the SESSION modifier, the isolation level @@ -689,7 +691,7 @@ static void fix_key_buffer_size(THD *thd, enum_var_type type) } -void fix_delay_key_write(THD *thd, enum_var_type type) +extern void fix_delay_key_write(THD *thd, enum_var_type type) { switch ((enum_delay_key_write) delay_key_write_options) { case DELAY_KEY_WRITE_NONE: @@ -705,7 +707,7 @@ void fix_delay_key_write(THD *thd, enum_var_type type) } } -void fix_max_binlog_size(THD *thd, enum_var_type type) +static void fix_max_binlog_size(THD *thd, enum_var_type type) { DBUG_ENTER("fix_max_binlog_size"); DBUG_PRINT("info",("max_binlog_size=%lu max_relay_log_size=%lu", @@ -716,7 +718,7 @@ void fix_max_binlog_size(THD *thd, enum_var_type type) DBUG_VOID_RETURN; } -void fix_max_relay_log_size(THD *thd, enum_var_type type) +static void fix_max_relay_log_size(THD *thd, enum_var_type type) { DBUG_ENTER("fix_max_relay_log_size"); DBUG_PRINT("info",("max_binlog_size=%lu max_relay_log_size=%lu", @@ -726,6 +728,13 @@ 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) +{ + resize_thr_alarm(max_connections); +} + bool sys_var_long_ptr::update(THD *thd, set_var *var) { ulonglong tmp= var->value->val_int(); @@ -1478,7 +1487,7 @@ int set_var::check(THD *thd) { my_error(ER_WRONG_TYPE_FOR_VAR, MYF(0), var->name); return -1; - } + } return var->check(thd, this) ? -1 : 0; } |