diff options
Diffstat (limited to 'mysql-test/main/mysqld--help,win.rdiff')
| -rw-r--r-- | mysql-test/main/mysqld--help,win.rdiff | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/mysql-test/main/mysqld--help,win.rdiff b/mysql-test/main/mysqld--help,win.rdiff index 6aba3acab28..77f6f76858f 100644 --- a/mysql-test/main/mysqld--help,win.rdiff +++ b/mysql-test/main/mysqld--help,win.rdiff @@ -1,6 +1,6 @@ ---- mysqld--help.result 2018-08-12 00:10:13.694793500 +0100 -+++ mysqld--help,win.reject 2018-08-16 20:31:08.353317200 +0100 -@@ -386,7 +386,6 @@ +--- a/mysql-test/r/mysqld--help.result ++++ b/mysql-test/r/mysqld--help.result +@@ -419,7 +419,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 -@@ -608,6 +607,7 @@ +@@ -647,6 +646,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=# -@@ -1188,6 +1188,10 @@ +@@ -1236,6 +1236,10 @@ Log slow queries to given log file. Defaults logging to 'hostname'-slow.log. Must be enabled to activate other slow log options @@ -27,15 +27,15 @@ --socket=name Socket file to use for connection --sort-buffer-size=# Each thread that needs to do a sort allocates a buffer of -@@ -1207,6 +1211,7 @@ - EMPTY_STRING_IS_NULL, SIMULTANEOUS_ASSIGNMENT +@@ -1260,6 +1264,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.) -@@ -1277,6 +1282,11 @@ +@@ -1330,6 +1335,11 @@ --thread-pool-max-threads=# Maximum allowed number of worker threads in the thread pool @@ -47,7 +47,7 @@ --thread-pool-oversubscribe=# How many additional active worker threads in a group are allowed. -@@ -1315,8 +1325,8 @@ +@@ -1370,8 +1380,8 @@ automatically convert it to an on-disk MyISAM or Aria table. -t, --tmpdir=name Path for temporary files. Several paths may be specified, @@ -58,7 +58,7 @@ --transaction-alloc-block-size=# Allocation block size for transactions to be stored in binary log -@@ -1451,7 +1461,6 @@ +@@ -1513,7 +1523,6 @@ key-cache-division-limit 100 key-cache-file-hash-size 512 key-cache-segments 0 @@ -66,7 +66,7 @@ lc-messages en_US lc-messages-dir MYSQL_SHAREDIR/ lc-time-names en_US -@@ -1523,6 +1532,7 @@ +@@ -1587,6 +1596,7 @@ myisam-stats-method NULLS_UNEQUAL myisam-use-mmap FALSE mysql56-temporal-format TRUE @@ -74,15 +74,15 @@ net-buffer-length 16384 net-read-timeout 30 net-retry-count 10 -@@ -1660,6 +1670,7 @@ +@@ -1726,6 +1736,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 - stack-trace TRUE -@@ -1674,9 +1685,9 @@ + sql-safe-updates FALSE +@@ -1741,10 +1752,10 @@ sync-relay-log-info 10000 sysdate-is-now FALSE system-versioning-alter-history ERROR @@ -90,11 +90,13 @@ +table-cache 2000 table-definition-cache 400 -table-open-cache 421 +-table-open-cache-instances 1 +table-open-cache 2000 - table-open-cache-instances 8 ++table-open-cache-instances 8 tc-heuristic-recover OFF tcp-keepalive-interval 0 -@@ -1686,6 +1697,8 @@ + tcp-keepalive-probes 0 +@@ -1753,6 +1764,8 @@ thread-cache-size 151 thread-pool-idle-timeout 60 thread-pool-max-threads 65536 |