diff options
Diffstat (limited to 'mysql-test/r/mysqld--help,win.rdiff')
| -rw-r--r-- | mysql-test/r/mysqld--help,win.rdiff | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/mysql-test/r/mysqld--help,win.rdiff b/mysql-test/r/mysqld--help,win.rdiff index 4e93c2ade69..93017dab1c1 100644 --- a/mysql-test/r/mysqld--help,win.rdiff +++ b/mysql-test/r/mysqld--help,win.rdiff @@ -1,6 +1,8 @@ +diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result +index 51681bdc8d3..c80f1054af4 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result -@@ -341,7 +341,6 @@ +@@ -342,7 +342,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 +10,7 @@ --lc-messages=name Set the language used for the error messages. -L, --lc-messages-dir=name Directory where error messages are -@@ -551,6 +550,7 @@ +@@ -552,6 +551,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 +18,7 @@ --net-buffer-length=# Buffer length for TCP/IP and socket communication --net-read-timeout=# -@@ -965,6 +965,9 @@ +@@ -966,6 +966,9 @@ characteristics (isolation level, read only/read write,snapshot - but not any work done / data modified within the transaction). @@ -26,7 +28,7 @@ --show-slave-auth-info Show user and password in SHOW SLAVE HOSTS on this master. -@@ -1077,6 +1080,10 @@ +@@ -1078,6 +1081,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 +39,7 @@ --socket=name Socket file to use for connection --sort-buffer-size=# Each thread that needs to do a sort allocates a buffer of -@@ -1095,6 +1102,7 @@ +@@ -1096,6 +1103,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 +47,7 @@ --standard-compliant-cte Allow only CTEs compliant to SQL standard (Defaults to on; use --skip-standard-compliant-cte to disable.) -@@ -1143,6 +1151,11 @@ +@@ -1144,6 +1152,11 @@ --thread-pool-max-threads=# Maximum allowed number of worker threads in the thread pool @@ -57,7 +59,7 @@ --thread-pool-oversubscribe=# How many additional active worker threads in a group are allowed. -@@ -1181,8 +1194,8 @@ +@@ -1182,8 +1195,8 @@ 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 +70,7 @@ --transaction-alloc-block-size=# Allocation block size for transactions to be stored in binary log -@@ -1308,7 +1321,6 @@ +@@ -1309,7 +1322,6 @@ key-cache-division-limit 100 key-cache-file-hash-size 512 key-cache-segments 0 @@ -94,14 +96,14 @@ silent-startup FALSE skip-grant-tables TRUE @@ -1503,6 +1518,7 @@ - slave-type-conversions + slave-type-conversions (Empty set) 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 -@@ -1516,6 +1532,8 @@ +@@ -1521,6 +1537,8 @@ thread-cache-size 151 thread-pool-idle-timeout 60 thread-pool-max-threads 65536 |