summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2013-12-27 13:00:14 +0200
committerMichael Widenius <monty@askmonty.org>2013-12-27 13:00:14 +0200
commite41788d2b286bb9d76e972e57d2b476abd5efc86 (patch)
tree0704c35e9138260f93e5d6f1b1e82dba11e36614 /mysql-test
parent02765f4c614069ece1f30976848b6299ba6f24bd (diff)
downloadmariadb-git-e41788d2b286bb9d76e972e57d2b476abd5efc86.tar.gz
Increased back_log to 150, but not more than max_connections.
- This was done to get better performance when doing a lot of connections. Ensure that thread_cache_size is not larger than max_connections (trivial optimizations). Fixed that the --host_cache_size=# startup option works mysql-test/r/variables.result: Increase back_log to 150 sql/hostname.cc: Fixed that the --host_cache_size=# startup option works sql/mysqld.cc: Ensure that back_log and thread_cache_size is not set higher than max_connections (as this would not make any sense). sql/sys_vars.cc: Increased back_log to 150
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/variables.result4
-rw-r--r--mysql-test/suite/sys_vars/r/back_log_basic.result10
2 files changed, 7 insertions, 7 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 9b1c1b6955e..eb896082810 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -1137,12 +1137,12 @@ ERROR HY000: Variable 'ft_stopword_file' is a read only variable
#
SHOW VARIABLES like 'back_log';
Variable_name Value
-back_log 50
+back_log 150
SELECT @@session.back_log;
ERROR HY000: Variable 'back_log' is a GLOBAL variable
SELECT @@global.back_log;
@@global.back_log
-50
+150
SET @@session.back_log= 7;
ERROR HY000: Variable 'back_log' is a read only variable
SET @@global.back_log= 7;
diff --git a/mysql-test/suite/sys_vars/r/back_log_basic.result b/mysql-test/suite/sys_vars/r/back_log_basic.result
index 5cfb0da65d6..d68e72a8a4a 100644
--- a/mysql-test/suite/sys_vars/r/back_log_basic.result
+++ b/mysql-test/suite/sys_vars/r/back_log_basic.result
@@ -1,20 +1,20 @@
select @@global.back_log;
@@global.back_log
-50
+150
select @@session.back_log;
ERROR HY000: Variable 'back_log' is a GLOBAL variable
show global variables like 'back_log';
Variable_name Value
-back_log 50
+back_log 150
show session variables like 'back_log';
Variable_name Value
-back_log 50
+back_log 150
select * from information_schema.global_variables where variable_name='back_log';
VARIABLE_NAME VARIABLE_VALUE
-BACK_LOG 50
+BACK_LOG 150
select * from information_schema.session_variables where variable_name='back_log';
VARIABLE_NAME VARIABLE_VALUE
-BACK_LOG 50
+BACK_LOG 150
set global back_log=1;
ERROR HY000: Variable 'back_log' is a read only variable
set session back_log=1;