database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

adjust test result file

Browse Source
This commit is contained in:
Vladislav Vaintroub
2010-01-13 21:31:33 +01:00
parent 16e1db990a
commit 548e2e3e63
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/r/mysqld--help-notwin.result
View File

@@ -128,7 +128,8 @@ The following options may be given as the first argument:
on that value on that value
--enable-locking Deprecated option, use --external-locking instead. --enable-locking Deprecated option, use --external-locking instead.
--engine-condition-pushdown --engine-condition-pushdown
Push supported query conditions to the storage engine Push supported query conditions to the storage engine.
Deprecated, use --optimizer-switch instead.
(Defaults to on; use --skip-engine-condition-pushdown to disable.) (Defaults to on; use --skip-engine-condition-pushdown to disable.)
--event-scheduler[=name] --event-scheduler[=name]
Enable the event scheduler. Possible values are ON, OFF, Enable the event scheduler. Possible values are ON, OFF,
@@ -407,8 +408,9 @@ The following options may be given as the first argument:
--optimizer-switch=name --optimizer-switch=name
optimizer_switch=option=val[,option=val...], where option optimizer_switch=option=val[,option=val...], where option
is one of {index_merge, index_merge_union, is one of {index_merge, index_merge_union,
index_merge_sort_union, index_merge_intersection} and val index_merge_sort_union, index_merge_intersection,
is one of {on, off, default} engine_condition_pushdown} and val is one of {on, off,
default}
--pid-file=name Pid file used by safe_mysqld --pid-file=name Pid file used by safe_mysqld
--plugin-dir=name Directory for plugins --plugin-dir=name Directory for plugins
--plugin-load=name Optional semicolon-separated list of plugins to load, --plugin-load=name Optional semicolon-separated list of plugins to load,
@@ -730,7 +732,6 @@ completion-type NO_CHAIN
concurrent-insert AUTO concurrent-insert AUTO
connect-timeout 10 connect-timeout 10
console FALSE console FALSE
datadir MYSQLTEST_VARDIR/install.db/
date-format %Y-%m-%d date-format %Y-%m-%d
datetime-format %Y-%m-%d %H:%i:%s datetime-format %Y-%m-%d %H:%i:%s
default-character-set latin1 default-character-set latin1
@@ -840,7 +841,7 @@ old-passwords FALSE
old-style-user-limits FALSE old-style-user-limits FALSE
optimizer-prune-level 1 optimizer-prune-level 1
optimizer-search-depth 62 optimizer-search-depth 62
optimizer-switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on optimizer-switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on
plugin-load (No default value) plugin-load (No default value)
port 3306 port 3306
port-open-timeout 0 port-open-timeout 0
@@ -881,7 +882,6 @@ skip-show-database FALSE
skip-slave-start FALSE skip-slave-start FALSE
slave-compressed-protocol FALSE slave-compressed-protocol FALSE
slave-exec-mode STRICT slave-exec-mode STRICT
slave-load-tmpdir MYSQLTEST_VARDIR/tmp/
slave-net-timeout 3600 slave-net-timeout 3600
slave-skip-errors (No default value) slave-skip-errors (No default value)
slave-transaction-retries 10 slave-transaction-retries 10
@@ -909,7 +909,6 @@ thread-stack 262144
time-format %H:%i:%s time-format %H:%i:%s
timed-mutexes FALSE timed-mutexes FALSE
tmp-table-size 16777216 tmp-table-size 16777216
tmpdir MYSQLTEST_VARDIR/tmp/
transaction-alloc-block-size 8192 transaction-alloc-block-size 8192
transaction-isolation REPEATABLE-READ transaction-isolation REPEATABLE-READ
transaction-prealloc-size 4096 transaction-prealloc-size 4096