List:Commits« Previous MessageNext Message »
From:Martin Hansson Date:January 20 2011 12:31pm
Subject:bzr push into mysql-trunk branch (martin.hansson:3536 to 3537)
View as plain text  
 3537 Martin Hansson	2011-01-20 [merge]
      Merge.

 3536 Jorgen Loland	2011-01-20 [merge]
      Automerge opt-team -> trunk. No conflicts

    modified:
      mysql-test/include/mrr_tests.inc
      mysql-test/include/subquery.inc
      mysql-test/r/innodb_icp_all.result
      mysql-test/r/innodb_mrr.result
      mysql-test/r/innodb_mrr_all.result
      mysql-test/r/innodb_mrr_cost.result
      mysql-test/r/innodb_mrr_cost_all.result
      mysql-test/r/innodb_mrr_cost_icp.result
      mysql-test/r/innodb_mrr_icp.result
      mysql-test/r/innodb_mrr_none.result
      mysql-test/r/join_outer_jcl6.result
      mysql-test/r/myisam_icp_all.result
      mysql-test/r/myisam_mrr.result
      mysql-test/r/myisam_mrr_all.result
      mysql-test/r/myisam_mrr_cost.result
      mysql-test/r/myisam_mrr_cost_all.result
      mysql-test/r/myisam_mrr_cost_icp.result
      mysql-test/r/myisam_mrr_icp.result
      mysql-test/r/myisam_mrr_none.result
      mysql-test/r/select_all_jcl6.result
      mysql-test/r/select_icp_mrr_jcl6.result
      mysql-test/r/select_none_jcl6.result
      mysql-test/r/subquery_all.result
      mysql-test/r/subquery_all_jcl6.result
      mysql-test/r/subquery_nomat_nosj.result
      mysql-test/r/subquery_nomat_nosj_jcl6.result
      mysql-test/r/subquery_none.result
      mysql-test/r/subquery_none_jcl6.result
      mysql-test/r/subquery_sj_mat_nosj.result
      mysql-test/r/subquery_sj_none_jcl6.result
      mysql-test/r/subquery_sj_none_jcl7.result
      sql/field.cc
      sql/field.h
      sql/handler.cc
      sql/item.cc
      sql/item_subselect.cc
      sql/sql_select.cc
      sql/table.cc

Attachment: [text/bzr-bundle] bzr/martin.hansson@oracle.com-20110120123036-v0ke0x005v11g45p.bundle
Thread
bzr push into mysql-trunk branch (martin.hansson:3536 to 3537) Martin Hansson20 Jan