diff options
| author | unknown <monty@mishka.local> | 2004-04-27 15:48:48 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2004-04-27 15:48:48 +0300 |
| commit | 4f44862bda76461f92100bfe9053e2c62bdd9b53 (patch) | |
| tree | 890fb3189cef1e6fedace9c5f73a2a9a881dfe86 /sql/set_var.cc | |
| parent | c41919f3583aa40645cc10571718b39091980c25 (diff) | |
| parent | a3828081cde644ab551c21a621b8e6ab69923e6a (diff) | |
| download | mariadb-git-4f44862bda76461f92100bfe9053e2c62bdd9b53.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.local:/home/my/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
sql/set_var.cc:
Auto merged
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 0cf4d2d2691..1339bdc887f 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1094,9 +1094,9 @@ static void fix_max_relay_log_size(THD *thd, enum_var_type type) static int check_max_delayed_threads(THD *thd, set_var *var) { - int val= var->value->val_int(); + longlong val= var->value->val_int(); if (var->type != OPT_GLOBAL && val != 0 && - val != global_system_variables.max_insert_delayed_threads) + val != (longlong) global_system_variables.max_insert_delayed_threads) { char buf[64]; my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), var->var->name, llstr(val, buf)); @@ -1105,6 +1105,7 @@ static int check_max_delayed_threads(THD *thd, set_var *var) return 0; } + static void fix_max_connections(THD *thd, enum_var_type type) { resize_thr_alarm(max_connections + |