diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-02-06 20:03:04 +0100 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-02-07 13:40:08 +0100 |
commit | 82c3b42a6e75f1b19b334c7327a9e3cdf9b42e42 (patch) | |
tree | f75866a95703846742cbf4674b453882f51c4f43 /mysql-test | |
parent | 3be751d5b9076239baaa07677ab81304fcd92207 (diff) | |
download | mariadb-git-82c3b42a6e75f1b19b334c7327a9e3cdf9b42e42.tar.gz |
Windows test fix
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/mysqld--help,win.rdiff | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/mysql-test/r/mysqld--help,win.rdiff b/mysql-test/r/mysqld--help,win.rdiff index 7ef9ec5da5f..6f151591643 100644 --- a/mysql-test/r/mysqld--help,win.rdiff +++ b/mysql-test/r/mysqld--help,win.rdiff @@ -1,6 +1,6 @@ --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result -@@ -334,7 +334,6 @@ +@@ -341,7 +341,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 -@@ -543,6 +542,7 @@ +@@ -551,6 +550,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=# -@@ -957,6 +957,9 @@ +@@ -965,6 +965,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. -@@ -1069,6 +1072,10 @@ +@@ -1077,6 +1080,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 -@@ -1087,6 +1094,7 @@ +@@ -1095,6 +1102,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 @@ --standard-compliant-cte Allow only CTEs compliant to SQL standard (Defaults to on; use --skip-standard-compliant-cte to disable.) -@@ -1135,6 +1143,11 @@ +@@ -1143,6 +1151,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 @@ +@@ -1181,8 +1194,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 @@ +@@ -1308,7 +1321,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 @@ +@@ -1378,6 +1390,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 @@ +@@ -1479,6 +1492,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 @@ +@@ -1503,6 +1518,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 @@ +@@ -1516,14 +1532,16 @@ sync-relay-log 10000 sync-relay-log-info 10000 sysdate-is-now FALSE @@ -109,8 +109,9 @@ +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 thread-cache-size 151 thread-pool-idle-timeout 60 |