adjust test result file

1 files changed, 6 insertions, 7 deletions

diff --git a/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result
index 13236cb9684..0066a942ea3 100644
--- a/mysql-test/r/mysqld--help-notwin.result
+++ b/mysql-test/r/mysqld--help-notwin.result
@@ -128,7 +128,8 @@ The following options may be given as the first argument:
  on that value
  --enable-locking    Deprecated option, use --external-locking instead.
  --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.)
  --event-scheduler[=name] 
  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=option=val[,option=val...], where option
  is one of {index_merge, index_merge_union,
- index_merge_sort_union, index_merge_intersection} and val
- is one of {on, off, default}
+ index_merge_sort_union, index_merge_intersection,
+ engine_condition_pushdown} and val is one of {on, off,
+ default}
  --pid-file=name     Pid file used by safe_mysqld
  --plugin-dir=name   Directory for plugins
  --plugin-load=name  Optional semicolon-separated list of plugins to load,
@@ -730,7 +732,6 @@ completion-type NO_CHAIN
 concurrent-insert AUTO
 connect-timeout 10
 console FALSE
-datadir MYSQLTEST_VARDIR/install.db/
 date-format %Y-%m-%d
 datetime-format %Y-%m-%d %H:%i:%s
 default-character-set latin1
@@ -840,7 +841,7 @@ old-passwords FALSE
 old-style-user-limits FALSE
 optimizer-prune-level 1
 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)
 port 3306
 port-open-timeout 0
@@ -881,7 +882,6 @@ skip-show-database FALSE
 skip-slave-start FALSE
 slave-compressed-protocol FALSE
 slave-exec-mode STRICT
-slave-load-tmpdir MYSQLTEST_VARDIR/tmp/
 slave-net-timeout 3600
 slave-skip-errors (No default value)
 slave-transaction-retries 10
@@ -909,7 +909,6 @@ thread-stack 262144
 time-format %H:%i:%s
 timed-mutexes FALSE
 tmp-table-size 16777216
-tmpdir MYSQLTEST_VARDIR/tmp/
 transaction-alloc-block-size 8192
 transaction-isolation REPEATABLE-READ
 transaction-prealloc-size 4096