From: Tor Didriksen
Date: July 7 2011 12:45pm
Subject: bzr push into mysql-trunk branch (tor.didriksen:3252 to 3253)
List-Archive: http://lists.mysql.com/commits/140238
Message-Id: <201107071245.p67CjPqX001039@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3253 Tor Didriksen	2011-07-07 [merge]
      Automerge opt-team => trunk

    added:
      mysql-test/include/explain_non_select.inc
      mysql-test/include/explain_utils.inc
      mysql-test/r/grant_explain_non_select.result
      mysql-test/r/innodb_explain_non_select_all.result
      mysql-test/r/innodb_explain_non_select_none.result
      mysql-test/r/myisam_explain_non_select_all.result
      mysql-test/r/myisam_explain_non_select_none.result
      mysql-test/t/grant_explain_non_select.test
      mysql-test/t/innodb_explain_non_select_all.test
      mysql-test/t/innodb_explain_non_select_none.test
      mysql-test/t/myisam_explain_non_select_all.test
      mysql-test/t/myisam_explain_non_select_none.test
      sql/opt_explain.cc
      sql/opt_explain.h
    modified:
      client/mysqltest.cc
      mysql-test/r/explain.result
      mysql-test/r/join_outer.result
      mysql-test/r/join_outer_jcl6.result
      mysql-test/r/partition_pruning.result
      mysql-test/t/explain.test
      mysql-test/t/partition_pruning.test
      sql/CMakeLists.txt
      sql/opt_range.h
      sql/sql_class.h
      sql/sql_delete.cc
      sql/sql_insert.cc
      sql/sql_parse.cc
      sql/sql_parse.h
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_show.cc
      sql/sql_string.h
      sql/sql_update.cc
      sql/sql_view.cc
      sql/sql_yacc.yy
 3252 Tor Didriksen	2011-07-07 [merge]
      Automerge opt-team => trunk

    modified:
      mysql-test/r/subquery_all.result
      mysql-test/r/subquery_all_jcl6.result
      mysql-test/r/subquery_nomat_nosj_jcl6.result
      mysql-test/r/subquery_none_jcl6.result
      sql/opt_range.cc

Diff too large for email (17236 lines, the limit is 10000).
No bundle (reason: useless for push emails).