From: Tor Didriksen
Date: June 5 2012 2:16pm
Subject: bzr push into mysql-trunk branch (tor.didriksen:3964 to 3965)
List-Archive: http://lists.mysql.com/commits/144096
Message-Id: <201206051416.q55EG44b007796@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3965 Tor Didriksen	2012-06-05 [merge]
      NULL merge 5.5 => trunk

 3964 Jorgen Loland	2012-06-05
      Optimizer trace cleanup:
      
      - When the range optimizer decides that an index cannot be used
        it doesn't make sense to print info like whether or not
        DsMRR will be used or if the index is rowid ordered. Remove 
        this info in such cases.
      
      - When the optimizer decides that range access is not possible
        on an index, optimizer trace used to print 
        "chosen: false, cause: cost" even in cases where the cost was
        not the reason. Now print "cause: unkown" in these cases.

    modified:
      mysql-test/suite/opt_trace/r/bugs_no_prot_all.result
      mysql-test/suite/opt_trace/r/bugs_no_prot_none.result
      mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result
      mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result
      mysql-test/suite/opt_trace/r/charset.result
      mysql-test/suite/opt_trace/r/eq_range_statistics.result
      mysql-test/suite/opt_trace/r/general2_no_prot.result
      mysql-test/suite/opt_trace/r/general2_ps_prot.result
      mysql-test/suite/opt_trace/r/general_no_prot_all.result
      mysql-test/suite/opt_trace/r/general_no_prot_none.result
      mysql-test/suite/opt_trace/r/general_ps_prot_all.result
      mysql-test/suite/opt_trace/r/general_ps_prot_none.result
      mysql-test/suite/opt_trace/r/range_no_prot.result
      mysql-test/suite/opt_trace/r/range_ps_prot.result
      mysql-test/suite/opt_trace/r/subquery_no_prot.result
      mysql-test/suite/opt_trace/r/subquery_ps_prot.result
      sql/opt_range.cc
No bundle (reason: useless for push emails).