diff options
Diffstat (limited to 'mysql-test')
5 files changed, 10 insertions, 4 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index bcc985a8a50..7005a850ea5 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -569,9 +569,10 @@ The following options may be given as the first argument: --open-files-limit=# If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this - value is 0 then mysqld will reserve max_connections*5 or - max_connections + table_cache*2 (whichever is larger) - number of file descriptors + value is 0 or autoset then mysqld will reserve + max_connections*5 or max_connections + table_cache*2 + (whichever is larger) number of file descriptors + (Automatically configured unless set explicitly) --optimizer-prune-level=# Controls the heuristic(s) applied during query optimization to prune less-promising partial plans from diff --git a/mysql-test/suite/sys_vars/r/host_cache_size_auto.result b/mysql-test/suite/sys_vars/r/host_cache_size_auto.result new file mode 100644 index 00000000000..a9a683e017b --- /dev/null +++ b/mysql-test/suite/sys_vars/r/host_cache_size_auto.result @@ -0,0 +1,3 @@ +select @@global.host_cache_size; +@@global.host_cache_size +653 diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result index 8d68dce0245..329b519588d 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result @@ -5216,7 +5216,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME OPEN_FILES_LIMIT VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors +VARIABLE_COMMENT If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 or autoset then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 NUMERIC_BLOCK_SIZE 1 diff --git a/mysql-test/suite/sys_vars/t/host_cache_size_auto-master.opt b/mysql-test/suite/sys_vars/t/host_cache_size_auto-master.opt new file mode 100644 index 00000000000..ae09e3f57ac --- /dev/null +++ b/mysql-test/suite/sys_vars/t/host_cache_size_auto-master.opt @@ -0,0 +1 @@ +--max_connections=1000 --open-files-limit=1000 --autoset-host-cache-size diff --git a/mysql-test/suite/sys_vars/t/host_cache_size_auto.test b/mysql-test/suite/sys_vars/t/host_cache_size_auto.test new file mode 100644 index 00000000000..35846713d70 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/host_cache_size_auto.test @@ -0,0 +1 @@ +select @@global.host_cache_size; |