Adding upstream version 1:10.11.6.upstream/1%10.11.6upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 83 insertions, 0 deletions

diff --git a/mysql-test/main/mysqld--help,win.rdiff b/mysql-test/main/mysqld--help,win.rdiff
new file mode 100644
index 00000000..3e9541d7
--- /dev/null
+++ b/mysql-test/main/mysqld--help,win.rdiff
@@ -0,0 +1,83 @@
+@@ -180,6 +180,7 @@
+  --console           Write error output on screen; don't remove the console
+  window on windows.
+  --core-file         Write core on crashes
++ (Defaults to on; use --skip-core-file to disable.)
+  -h, --datadir=name  Path to the database root directory
+  --date-format=name  The DATE format (ignored)
+  --datetime-format=name 
+@@ -650,6 +651,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.)
++ --named-pipe        Enable the named pipe (NT)
+  --net-buffer-length=# 
+  Buffer length for TCP/IP and socket communication
+  --net-read-timeout=# 
+@@ -1327,6 +1328,10 @@
+  Alias for log_slow_query_file. Log slow queries to given
+  log file. Defaults logging to 'hostname'-slow.log. Must
+  be enabled to activate other slow log options
++ --slow-start-timeout=# 
++ Maximum number of milliseconds that the service control
++ manager should wait before trying to kill the windows
++ service during startup(Default: 15000).
+  --socket=name       Socket file to use for connection
+  --sort-buffer-size=# 
+  Each thread that needs to do a sort allocates a buffer of
+@@ -1351,6 +1356,7 @@
+  deleting or updating every row in a table.
+  --stack-trace       Print a symbolic stack trace on failure
+  (Defaults to on; use --skip-stack-trace to disable.)
++ --standalone        Dummy option to start as a standalone program (NT).
+  --standard-compliant-cte 
+  Allow only CTEs compliant to SQL standard
+  (Defaults to on; use --skip-standard-compliant-cte to disable.)
+@@ -1426,6 +1432,11 @@
+  --thread-pool-max-threads=# 
+  Maximum allowed number of worker threads in the thread
+  pool
++ --thread-pool-min-threads=# 
++ Minimum number of threads in the thread pool.
++ --thread-pool-mode=name 
++ Chose implementation of the threadpool. One of: windows, 
++ generic
+  --thread-pool-oversubscribe=# 
+  How many additional active worker threads in a group are
+  allowed.
+@@ -1464,8 +1475,8 @@
+  automatically convert it to an on-disk MyISAM or Aria
+  table.
+  -t, --tmpdir=name   Path for temporary files. Several paths may be specified,
+- separated by a colon (:), in this case they are used in a
+- round-robin fashion
++ separated by a semicolon (;), in this case they are used
++ in a round-robin fashion
+  --transaction-alloc-block-size=# 
+  Allocation block size for transactions to be stored in
+  binary log
+@@ -1685,6 +1696,7 @@
+ myisam-stats-method NULLS_UNEQUAL
+ myisam-use-mmap FALSE
+ mysql56-temporal-format TRUE
++named-pipe FALSE
+ net-buffer-length 16384
+ net-read-timeout 30
+ net-retry-count 10
+@@ -1841,6 +1853,7 @@
+ slave-type-conversions 
+ slow-launch-time 2
+ slow-query-log FALSE
++slow-start-timeout 15000
+ sort-buffer-size 2097152
+ sql-mode STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
+ sql-safe-updates FALSE
+@@ -1867,6 +1880,8 @@
+ thread-pool-exact-stats FALSE
+ thread-pool-idle-timeout 60
+ thread-pool-max-threads 65536
++thread-pool-min-threads 1
++thread-pool-mode windows
+ thread-pool-oversubscribe 3
+ thread-pool-prio-kickup-timer 1000
+ thread-pool-priority auto