List:Commits« Previous MessageNext Message »
From:Evgeny Potemkin Date:August 15 2010 9:45am
Subject:bzr commit into mysql-next-mr-opt-team branch (epotemkin:3210)
View as plain text  
#At file:///work/bzrroot/mysql-next-mr-opt-team/ based on revid:epotemkin@stripped

 3210 Evgeny Potemkin	2010-08-15
      Post-merge fix.

    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	2010-08-13 18:54:57 +0000
+++ b/mysql-test/r/mysqld--help-win.result	2010-08-15 09:44:59 +0000
@@ -403,9 +403,7 @@ 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,
- engine_condition_pushdown, materialization, semijoin,
- loosescan, firstmatch, mrr, mrr_cost_based,
- index_condition_pushdown} and val is one of {on, off,
+ engine_condition_pushdown} and val is one of {on, off,
  default}
  --performance-schema 
  Enable the performance schema.
@@ -853,7 +851,7 @@ old-style-user-limits FALSE
 optimizer-join-cache-level 1
 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,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
 performance-schema FALSE
 performance-schema-events-waits-history-long-size 10000
 performance-schema-events-waits-history-size 10


Attachment: [text/bzr-bundle] bzr/epotemkin@mysql.com-20100815094459-gii96csphtx0tk1y.bundle
Thread
bzr commit into mysql-next-mr-opt-team branch (epotemkin:3210)Evgeny Potemkin15 Aug