increase default for max threads in the pool to max allowed value (64K) currently

4 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 4d66e8bad60..77a1427d893 100644
--- a/mysql-test/r/mysqld--help,win.rdiff
+++ b/mysql-test/r/mysqld--help,win.rdiff
@@ -1,5 +1,5 @@
---- mysqld--help.result	2016-09-21 13:50:58.682767100 +0000
-+++ mysqld--help,win.reject	2016-09-21 13:57:57.494626000 +0000
+--- mysqld--help.result	2016-11-04 13:35:06.665881700 +0000
++++ mysqld--help,win.reject	2016-11-04 13:58:39.030512500 +0000
 @@ -318,7 +318,6 @@
   The number of segments in a key cache
   -L, --language=name Client error messages in given language. May be given as
@@ -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 @@
+@@ -521,6 +520,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=# 
-@@ -924,6 +924,9 @@
+@@ -931,6 +931,9 @@
   characteristics (isolation level, read only/read
   write,snapshot - but not any work done / data modified
   within the transaction).
@@ -26,7 +26,7 @@
   --show-slave-auth-info 
   Show user and password in SHOW SLAVE HOSTS on this
   master.
-@@ -1036,6 +1039,10 @@
+@@ -1043,6 +1046,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
-@@ -1054,6 +1061,7 @@
+@@ -1061,6 +1068,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,7 +45,7 @@
   --standards-compliant-cte 
   Allow only standards compiant CTE
   (Defaults to on; use --skip-standards-compliant-cte to disable.)
-@@ -1102,6 +1110,11 @@
+@@ -1109,6 +1117,11 @@
   --thread-pool-max-threads=# 
   Maximum allowed number of worker threads in the thread
   pool
@@ -57,7 +57,7 @@
   --thread-pool-oversubscribe=# 
   How many additional active worker threads in a group are
   allowed.
-@@ -1132,8 +1145,8 @@
+@@ -1139,8 +1152,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,
@@ -68,7 +68,7 @@
   --transaction-alloc-block-size=# 
   Allocation block size for transactions to be stored in
   binary log
-@@ -1257,7 +1270,6 @@
+@@ -1264,7 +1277,6 @@
  key-cache-division-limit 100
  key-cache-file-hash-size 512
  key-cache-segments 0
@@ -76,7 +76,7 @@
  lc-messages en_US
  lc-messages-dir MYSQL_SHAREDIR/
  lc-time-names en_US
-@@ -1324,6 +1336,7 @@
+@@ -1333,6 +1345,7 @@
  myisam-stats-method NULLS_UNEQUAL
  myisam-use-mmap FALSE
  mysql56-temporal-format TRUE
@@ -84,7 +84,7 @@
  net-buffer-length 16384
  net-read-timeout 30
  net-retry-count 10
-@@ -1424,6 +1437,8 @@
+@@ -1434,6 +1447,8 @@
  session-track-state-change FALSE
  session-track-system-variables 
  session-track-transaction-info OFF
@@ -93,7 +93,7 @@
  show-slave-auth-info FALSE
  silent-startup FALSE
  skip-grant-tables TRUE
-@@ -1448,6 +1463,7 @@
+@@ -1458,6 +1473,7 @@
  slave-type-conversions 
  slow-launch-time 2
  slow-query-log FALSE
@@ -101,7 +101,7 @@
  sort-buffer-size 2097152
  sql-mode NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
  stack-trace TRUE
-@@ -1461,14 +1477,16 @@
+@@ -1471,14 +1487,16 @@
  sync-relay-log 10000
  sync-relay-log-info 10000
  sysdate-is-now FALSE
@@ -114,7 +114,7 @@
  tc-heuristic-recover OFF
  thread-cache-size 151
  thread-pool-idle-timeout 60
- thread-pool-max-threads 1000
+ thread-pool-max-threads 65536
 +thread-pool-min-threads 1
 +thread-pool-mode windows
  thread-pool-oversubscribe 3
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
index c6797eab5ae..5938da489f7 100644
--- a/mysql-test/r/mysqld--help.result
+++ b/mysql-test/r/mysqld--help.result
@@ -1487,7 +1487,7 @@ table-open-cache-instances 8
 tc-heuristic-recover OFF
 thread-cache-size 151
 thread-pool-idle-timeout 60
-thread-pool-max-threads 1000
+thread-pool-max-threads 65536
 thread-pool-oversubscribe 3
 thread-pool-prio-kickup-timer 1000
 thread-pool-priority auto
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 9f006cbdb9b..8ee6ce6492c 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
@@ -4785,9 +4785,9 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	THREAD_POOL_MAX_THREADS
 SESSION_VALUE	NULL
-GLOBAL_VALUE	1000
+GLOBAL_VALUE	65536
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	1000
+DEFAULT_VALUE	65536
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	INT UNSIGNED
 VARIABLE_COMMENT	Maximum allowed number of worker threads in the thread pool
diff --git a/mysql-test/suite/sys_vars/r/thread_pool_max_threads_basic.result b/mysql-test/suite/sys_vars/r/thread_pool_max_threads_basic.result
index 289c0d56092..5622d97cb68 100644
--- a/mysql-test/suite/sys_vars/r/thread_pool_max_threads_basic.result
+++ b/mysql-test/suite/sys_vars/r/thread_pool_max_threads_basic.result
@@ -1,21 +1,21 @@
 SET @start_global_value = @@global.thread_pool_max_threads;
 select @@global.thread_pool_max_threads;
 @@global.thread_pool_max_threads
-1000
+65536
 select @@session.thread_pool_max_threads;
 ERROR HY000: Variable 'thread_pool_max_threads' is a GLOBAL variable
 show global variables like 'thread_pool_max_threads';
 Variable_name	Value
-thread_pool_max_threads	1000
+thread_pool_max_threads	65536
 show session variables like 'thread_pool_max_threads';
 Variable_name	Value
-thread_pool_max_threads	1000
+thread_pool_max_threads	65536
 select * from information_schema.global_variables where variable_name='thread_pool_max_threads';
 VARIABLE_NAME	VARIABLE_VALUE
-THREAD_POOL_MAX_THREADS	1000
+THREAD_POOL_MAX_THREADS	65536
 select * from information_schema.session_variables where variable_name='thread_pool_max_threads';
 VARIABLE_NAME	VARIABLE_VALUE
-THREAD_POOL_MAX_THREADS	1000
+THREAD_POOL_MAX_THREADS	65536
 set global thread_pool_max_threads=1;
 select @@global.thread_pool_max_threads;
 @@global.thread_pool_max_threads