List:Commits« Previous MessageNext Message »
From:Tor Didriksen Date:June 27 2011 3:09pm
Subject:bzr push into mysql-trunk branch (tor.didriksen:3327 to 3332)
View as plain text  
 3332 Tor Didriksen	2011-06-27
      new test results after merging from opt-backporting

    modified:
      mysql-test/r/join_cache_jcl0.result
      mysql-test/r/join_cache_jcl1.result
      mysql-test/r/join_cache_jcl2.result
      mysql-test/r/join_cache_jcl3.result
      mysql-test/r/join_cache_jcl4.result
 3331 Tor Didriksen	2011-06-27 [merge]
      Merge opt-backporting => opt-team
      Text conflict in mysql-test/r/subselect_innodb.result
      Ran with --record.
      
      Still tests failing:
      main.join_cache_jcl0 
      main.join_cache_jcl1 
      main.join_cache_jcl2 
      main.join_cache_jcl3
      main.join_cache_jcl4 

    added:
      mysql-test/r/join_cache_jcl0.result
      mysql-test/t/join_cache_jcl0.test
    modified:
      mysql-test/include/join_cache.inc
      mysql-test/include/subquery.inc
      mysql-test/include/subquery_mat.inc
      mysql-test/include/subquery_sj.inc
      mysql-test/r/count_distinct.result
      mysql-test/r/distinct.result
      mysql-test/r/group_by.result
      mysql-test/r/join_cache_jcl1.result
      mysql-test/r/join_cache_jcl2.result
      mysql-test/r/join_cache_jcl3.result
      mysql-test/r/join_cache_jcl4.result
      mysql-test/r/join_cache_jcl5.result
      mysql-test/r/join_cache_jcl6.result
      mysql-test/r/join_cache_jcl7.result
      mysql-test/r/join_cache_jcl8.result
      mysql-test/r/join_nested.result
      mysql-test/r/join_nested_jcl6.result
      mysql-test/r/join_outer.result
      mysql-test/r/join_outer_jcl6.result
      mysql-test/r/null_key_all.result
      mysql-test/r/null_key_icp.result
      mysql-test/r/null_key_none.result
      mysql-test/r/order_by_all.result
      mysql-test/r/order_by_icp_mrr.result
      mysql-test/r/order_by_none.result
      mysql-test/r/select_all.result
      mysql-test/r/select_all_jcl6.result
      mysql-test/r/select_found.result
      mysql-test/r/select_icp_mrr.result
      mysql-test/r/select_icp_mrr_jcl6.result
      mysql-test/r/select_none.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_mat.result
      mysql-test/r/subquery_mat_all.result
      mysql-test/r/subquery_mat_none.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_all.result
      mysql-test/r/subquery_sj_all_jcl6.result
      mysql-test/r/subquery_sj_all_jcl7.result
      mysql-test/r/subquery_sj_dupsweed.result
      mysql-test/r/subquery_sj_dupsweed_jcl6.result
      mysql-test/r/subquery_sj_dupsweed_jcl7.result
      mysql-test/r/subquery_sj_firstmatch.result
      mysql-test/r/subquery_sj_firstmatch_jcl6.result
      mysql-test/r/subquery_sj_firstmatch_jcl7.result
      mysql-test/r/subquery_sj_loosescan.result
      mysql-test/r/subquery_sj_loosescan_jcl6.result
      mysql-test/r/subquery_sj_loosescan_jcl7.result
      mysql-test/r/subquery_sj_mat.result
      mysql-test/r/subquery_sj_mat_jcl6.result
      mysql-test/r/subquery_sj_mat_jcl7.result
      mysql-test/r/subquery_sj_mat_nosj.result
      mysql-test/r/subquery_sj_none.result
      mysql-test/r/subquery_sj_none_jcl6.result
      mysql-test/r/subquery_sj_none_jcl7.result
      mysql-test/r/subselect_innodb.result
      mysql-test/t/join_outer.test
      sql/item_subselect.cc
      sql/item_subselect.h
      sql/opt_range.cc
      sql/opt_sum.cc
      sql/sql_base.cc
      sql/sql_join_cache.cc
      sql/sql_select.cc
      sql/sql_select.h
 3330 Tor Didriksen	2011-06-27 [merge]
      NULL merge opt-backporting => opt-team
      reverted:
      M  mysql-test/r/group_min_max.result
      M  mysql-test/suite/innodb/r/innodb_mysql.result

 3329 Tor Didriksen	2011-06-27 [merge]
      Automerge opt-backporting => opt-team

    modified:
      mysql-test/r/range_all.result
 3328 Tor Didriksen	2011-06-27 [merge]
      empty merge opt-backporting => opt-team

 3327 Tor Didriksen	2011-05-26 [merge]
      empty merge trunk => opt-team


Diff too large for email (55954 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (tor.didriksen:3327 to 3332) Tor Didriksen27 Jun