diff options
Diffstat (limited to 'mysql-test/r/mysqld--help,win.rdiff')
| -rw-r--r-- | mysql-test/r/mysqld--help,win.rdiff | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mysql-test/r/mysqld--help,win.rdiff b/mysql-test/r/mysqld--help,win.rdiff index ac0f75b94eb..b061b7fbe66 100644 --- a/mysql-test/r/mysqld--help,win.rdiff +++ b/mysql-test/r/mysqld--help,win.rdiff @@ -45,7 +45,7 @@ --standard-compliant-cte Allow only CTEs compliant to SQL standard (Defaults to on; use --skip-standard-compliant-cte to disable.) -@@ -1135,6 +1143,11 @@ +@@ -1134,6 +1142,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. -@@ -1173,8 +1186,8 @@ +@@ -1172,8 +1185,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 +68,7 @@ --transaction-alloc-block-size=# Allocation block size for transactions to be stored in binary log -@@ -1299,7 +1312,6 @@ +@@ -1298,7 +1311,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 -@@ -1369,6 +1381,7 @@ +@@ -1368,6 +1380,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 -@@ -1470,6 +1483,8 @@ +@@ -1469,6 +1482,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 -@@ -1494,6 +1509,7 @@ +@@ -1493,6 +1508,7 @@ slave-type-conversions slow-launch-time 2 slow-query-log FALSE @@ -101,7 +101,7 @@ sort-buffer-size 2097152 sql-mode STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION stack-trace TRUE -@@ -1507,14 +1523,16 @@ +@@ -1506,14 +1522,16 @@ sync-relay-log 10000 sync-relay-log-info 10000 sysdate-is-now FALSE |