mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source 
sql/set_var.cc:
  SCCS merged
This commit is contained in:
unknown 2003-10-16 08:11:01 +03:00
commit 48d49976fd
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sql/set_var.cc
View file

@ -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();