From 02839ef249c724cde7c4b1b8d6815f1792ec0895 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 24 Mar 2016 09:35:14 +0100 Subject: more result updates --- mysql-test/r/mysqld--help,win.rdiff | 32 +++++++++++----------- .../sys_vars/r/sysvars_server_embedded.result | 12 ++++---- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/mysql-test/r/mysqld--help,win.rdiff b/mysql-test/r/mysqld--help,win.rdiff index a09b5603869..a3bf5c55ee8 100644 --- a/mysql-test/r/mysqld--help,win.rdiff +++ b/mysql-test/r/mysqld--help,win.rdiff @@ -1,6 +1,6 @@ --- mysqld--help.result +++ mysqld--help,win.reject -@@ -321,7 +321,6 @@ The following options may be given as the first argument: +@@ -321,7 +321,6 @@ The number of segments in a key cache -L, --language=name Client error messages in given language. May be given as a full path. Deprecated. Use --lc-messages-dir instead. @@ -8,7 +8,7 @@ --lc-messages=name Set the language used for the error messages. -L, --lc-messages-dir=name Directory where error messages are -@@ -517,6 +516,7 @@ The following options may be given as the first argument: +@@ -517,6 +516,7 @@ Use MySQL-5.6 (instead of MariaDB-5.3) format for TIME, DATETIME, TIMESTAMP columns. (Defaults to on; use --skip-mysql56-temporal-format to disable.) @@ -16,7 +16,7 @@ --net-buffer-length=# Buffer length for TCP/IP and socket communication --net-read-timeout=# -@@ -906,6 +906,9 @@ The following options may be given as the first argument: +@@ -903,6 +903,9 @@ files within specified directory --server-id=# Uniquely identifies the server instance in the community of replication partners @@ -26,7 +26,7 @@ --show-slave-auth-info Show user and password in SHOW SLAVE HOSTS on this master. -@@ -1016,6 +1019,10 @@ The following options may be given as the first argument: +@@ -1015,6 +1018,10 @@ Log slow queries to given log file. Defaults logging to 'hostname'-slow.log. Must be enabled to activate other slow log options @@ -37,7 +37,7 @@ --socket=name Socket file to use for connection --sort-buffer-size=# Each thread that needs to do a sort allocates a buffer of -@@ -1034,6 +1041,7 @@ The following options may be given as the first argument: +@@ -1033,6 +1040,7 @@ NO_ENGINE_SUBSTITUTION, PAD_CHAR_TO_FULL_LENGTH --stack-trace Print a symbolic stack trace on failure (Defaults to on; use --skip-stack-trace to disable.) @@ -45,10 +45,10 @@ --stored-program-cache=# The soft upper limit for number of cached stored routines for one connection. -@@ -1070,25 +1078,11 @@ The following options may be given as the first argument: - COMMIT, ROLLBACK +@@ -1070,25 +1078,11 @@ --thread-cache-size=# - How many threads we should keep in a cache for reuse + How many threads we should keep in a cache for reuse. + These are freed after 5 minutes of idle time - --thread-pool-idle-timeout=# - Timeout in seconds for an idle thread in the thread - pool.Worker thread will be shut down after timeout @@ -73,7 +73,7 @@ --thread-stack=# The stack size for each thread --time-format=name The TIME format (ignored) --timed-mutexes Specify whether to time mutexes. Deprecated, has no -@@ -1097,8 +1091,8 @@ The following options may be given as the first argument: +@@ -1097,8 +1091,8 @@ size, MySQL will automatically convert it to an on-disk MyISAM or Aria table -t, --tmpdir=name Path for temporary files. Several paths may be specified, @@ -84,7 +84,7 @@ --transaction-alloc-block-size=# Allocation block size for transactions to be stored in binary log -@@ -1224,7 +1218,6 @@ key-cache-block-size 1024 +@@ -1225,7 +1219,6 @@ key-cache-division-limit 100 key-cache-file-hash-size 512 key-cache-segments 0 @@ -92,7 +92,7 @@ lc-messages en_US lc-messages-dir MYSQL_SHAREDIR/ lc-time-names en_US -@@ -1290,6 +1283,7 @@ myisam-sort-buffer-size 134216704 +@@ -1291,6 +1284,7 @@ myisam-stats-method NULLS_UNEQUAL myisam-use-mmap FALSE mysql56-temporal-format TRUE @@ -100,7 +100,7 @@ net-buffer-length 16384 net-read-timeout 30 net-retry-count 10 -@@ -1386,6 +1380,8 @@ safe-user-create FALSE +@@ -1387,6 +1381,8 @@ secure-auth TRUE secure-file-priv (No default value) server-id 0 @@ -109,7 +109,7 @@ show-slave-auth-info FALSE silent-startup FALSE skip-grant-tables TRUE -@@ -1409,6 +1405,7 @@ slave-transaction-retries 10 +@@ -1411,6 +1407,7 @@ slave-type-conversions slow-launch-time 2 slow-query-log FALSE @@ -117,7 +117,7 @@ sort-buffer-size 2097152 sql-mode NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION stack-trace TRUE -@@ -1421,15 +1418,13 @@ sync-master-info 10000 +@@ -1423,15 +1420,13 @@ sync-relay-log 10000 sync-relay-log-info 10000 sysdate-is-now FALSE @@ -127,12 +127,12 @@ -table-open-cache 431 +table-open-cache 2000 tc-heuristic-recover COMMIT - thread-cache-size 0 + thread-cache-size 151 -thread-pool-idle-timeout 60 thread-pool-max-threads 1000 -thread-pool-oversubscribe 3 -thread-pool-stall-limit 500 +thread-pool-min-threads 1 - thread-stack 295936 + thread-stack 296960 time-format %H:%i:%s timed-mutexes FALSE diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result index cfd336ef15b..6d1579e77eb 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result @@ -3847,12 +3847,12 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME THREAD_CACHE_SIZE SESSION_VALUE NULL -GLOBAL_VALUE 0 -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 0 +GLOBAL_VALUE 151 +GLOBAL_VALUE_ORIGIN AUTO +DEFAULT_VALUE 256 VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT How many threads we should keep in a cache for reuse +VARIABLE_COMMENT How many threads we should keep in a cache for reuse. These are freed after 5 minutes of idle time NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 NUMERIC_BLOCK_SIZE 1 @@ -3889,9 +3889,9 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME THREAD_STACK SESSION_VALUE NULL -GLOBAL_VALUE 295936 +GLOBAL_VALUE 296960 GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 295936 +DEFAULT_VALUE 296960 VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The stack size for each thread -- cgit v1.2.1