[Resend] bzr commit into mysql-trunk branch (guilhem.bichot:3293)

[Guilhem Bichot]

[This commit e-mail is a repeat.]

#At file:///home/mysql_src/bzrrepos_new/mysql-next-mr-opt-backporting-wl4800-new2/ based
on revid:guilhem.bichot@stripped

 3293 Guilhem Bichot	2011-04-14
      Result file of Windows-specific test had not been updated since a while.

    modified:
      mysql-test/r/mysqld--help-win.result
=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result	2011-03-21 17:55:41 +0000
+++ b/mysql-test/r/mysqld--help-win.result	2011-04-14 08:23:17 +0000
@@ -426,11 +426,9 @@ The following options may be given as th
  optimizer_switch=option=val[,option=val...], where option
  is one of {index_merge, index_merge_union,
  index_merge_sort_union, index_merge_intersection,
-<<<<<<< TREE
- engine_condition_pushdown, materialization, semijoin,
- loosescan, firstmatch, mrr, mrr_cost_based,
- index_condition_pushdown} and val is one of {on, off,
- default}
+ engine_condition_pushdown, index_condition_pushdown, mrr,
+ mrr_cost_based, materialization, semijoin, loosescan,
+ firstmatch} and val is one of {on, off, default}
  --optimizer-trace=name 
  Controls tracing of the Optimizer:
  optimizer_trace=option=val[,option=val...], where option
@@ -440,25 +438,15 @@ The following options may be given as th
  Enables/disables tracing of selected features of the
  Optimizer:
  optimizer_trace_features=option=val[,option=val...],
- where option is one of {misc, greedy_search} and val is
- one of {on, off, default}
+ where option is one of {greedy_search, range_optimizer,
+ dynamic_range, repeated_subselect} and val is one of {on,
+ off, default}
  --optimizer-trace-limit=# 
  Maximum number of shown optimizer traces
  --optimizer-trace-max-mem-size=# 
- Maximum allowed cumulated size of stored optimizer
- traces
+ Maximum allowed cumulated size of stored optimizer traces
  --optimizer-trace-offset=# 
  Offset of first optimizer trace to show; see manual
-||||||| BASE-REVISION
- engine_condition_pushdown, materialization, semijoin,
- loosescan, firstmatch, mrr, mrr_cost_based,
- index_condition_pushdown} and val is one of {on, off,
- default}
-=======
- engine_condition_pushdown, index_condition_pushdown, mrr,
- mrr_cost_based, materialization, semijoin, loosescan,
- firstmatch} and val is one of {on, off, default}
->>>>>>> MERGE-SOURCE
  --performance-schema 
  Enable the performance schema.
  --performance-schema-events-waits-history-long-size=# 
@@ -922,18 +910,12 @@ old-style-user-limits FALSE
 optimizer-join-cache-level 4
 optimizer-prune-level 1
 optimizer-search-depth 62
-<<<<<<< TREE
-optimizer-switch
index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,materialization=on,semijoin=on,loosescan=on,firstmatch=on,mrr=on,mrr_cost_based=off,index_condition_pushdown=on
+optimizer-switch
index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,materialization=on,semijoin=on,loosescan=on,firstmatch=on
 optimizer-trace 
-optimizer-trace-features misc=on,greedy_search=on
+optimizer-trace-features
greedy_search=on,range_optimizer=on,dynamic_range=on,repeated_subselect=on
 optimizer-trace-limit 1
 optimizer-trace-max-mem-size 16384
 optimizer-trace-offset -1
-||||||| BASE-REVISION
-optimizer-switch
index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,materialization=on,semijoin=on,loosescan=on,firstmatch=on,mrr=on,mrr_cost_based=off,index_condition_pushdown=on
-=======
-optimizer-switch
index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,materialization=on,semijoin=on,loosescan=on,firstmatch=on
->>>>>>> MERGE-SOURCE
 performance-schema FALSE
 performance-schema-events-waits-history-long-size 10000
 performance-schema-events-waits-history-size 10


Attachment: [text/bzr-bundle] bzr/[e-mail]