List:Commits« Previous MessageNext Message »
From:marko.makela Date:October 4 2011 6:26pm
Subject:bzr push into mysql-trunk branch (marko.makela:3475 to 3476)
View as plain text  
 3476 Marko Mäkelä	2011-10-04 [merge]
      Merge mysql-5.5 to mysql-trunk.

 3475 kevin.lewis@stripped	2011-10-04 [merge]
      Merge with current mysql-trunk

    removed:
      mysql-test/r/join_cache_bka_nobnl.result
      mysql-test/r/join_nested_bka_nobnl.result
      mysql-test/r/join_outer_bka_nobnl.result
      mysql-test/r/select_all_bka_nobnl.result
      mysql-test/r/select_icp_mrr_bka_nobnl.result
      mysql-test/r/select_none_bka_nobnl.result
      mysql-test/r/subquery_all_bka_nobnl.result
      mysql-test/r/subquery_nomat_nosj_bka_nobnl.result
      mysql-test/r/subquery_none_bka_nobnl.result
      mysql-test/r/subquery_sj_all_bka_nobnl.result
      mysql-test/r/subquery_sj_dupsweed_bka_nobnl.result
      mysql-test/r/subquery_sj_firstmatch_bka_nobnl.result
      mysql-test/r/subquery_sj_innodb_all_bka_nobnl.result
      mysql-test/r/subquery_sj_innodb_none_bka_nobnl.result
      mysql-test/r/subquery_sj_loosescan_bka_nobnl.result
      mysql-test/r/subquery_sj_mat_bka_nobnl.result
      mysql-test/r/subquery_sj_none_bka_nobnl.result
      mysql-test/t/join_cache_bka_nobnl.test
      mysql-test/t/join_nested_bka_nobnl.test
      mysql-test/t/join_outer_bka_nobnl.test
      mysql-test/t/select_all_bka_nobnl.test
      mysql-test/t/select_icp_mrr_bka_nobnl.test
      mysql-test/t/select_none_bka_nobnl.test
      mysql-test/t/subquery_all_bka_nobnl.test
      mysql-test/t/subquery_nomat_nosj_bka_nobnl.test
      mysql-test/t/subquery_none_bka_nobnl.test
      mysql-test/t/subquery_sj_all_bka_nobnl.test
      mysql-test/t/subquery_sj_dupsweed_bka_nobnl.test
      mysql-test/t/subquery_sj_firstmatch_bka_nobnl.test
      mysql-test/t/subquery_sj_innodb_all_bka_nobnl.test
      mysql-test/t/subquery_sj_innodb_none_bka_nobnl.test
      mysql-test/t/subquery_sj_loosescan_bka_nobnl.test
      mysql-test/t/subquery_sj_mat_bka_nobnl.test
      mysql-test/t/subquery_sj_none_bka_nobnl.test
    added:
      mysql-test/r/join_cache_bka_nixbnl.result
      mysql-test/r/join_nested_bka_nixbnl.result
      mysql-test/r/join_outer_bka_nixbnl.result
      mysql-test/r/select_all_bka_nixbnl.result
      mysql-test/r/select_icp_mrr_bka_nixbnl.result
      mysql-test/r/select_none_bka_nixbnl.result
      mysql-test/r/subquery_all_bka_nixbnl.result
      mysql-test/r/subquery_nomat_nosj_bka_nixbnl.result
      mysql-test/r/subquery_none_bka_nixbnl.result
      mysql-test/r/subquery_sj_all_bka_nixbnl.result
      mysql-test/r/subquery_sj_dupsweed_bka_nixbnl.result
      mysql-test/r/subquery_sj_firstmatch_bka_nixbnl.result
      mysql-test/r/subquery_sj_innodb_all_bka_nixbnl.result
      mysql-test/r/subquery_sj_innodb_none_bka_nixbnl.result
      mysql-test/r/subquery_sj_loosescan_bka_nixbnl.result
      mysql-test/r/subquery_sj_mat_bka_nixbnl.result
      mysql-test/r/subquery_sj_none_bka_nixbnl.result
      mysql-test/t/join_cache_bka_nixbnl.test
      mysql-test/t/join_nested_bka_nixbnl.test
      mysql-test/t/join_outer_bka_nixbnl.test
      mysql-test/t/select_all_bka_nixbnl.test
      mysql-test/t/select_icp_mrr_bka_nixbnl.test
      mysql-test/t/select_none_bka_nixbnl.test
      mysql-test/t/subquery_all_bka_nixbnl.test
      mysql-test/t/subquery_nomat_nosj_bka_nixbnl.test
      mysql-test/t/subquery_none_bka_nixbnl.test
      mysql-test/t/subquery_sj_all_bka_nixbnl.test
      mysql-test/t/subquery_sj_dupsweed_bka_nixbnl.test
      mysql-test/t/subquery_sj_firstmatch_bka_nixbnl.test
      mysql-test/t/subquery_sj_innodb_all_bka_nixbnl.test
      mysql-test/t/subquery_sj_innodb_none_bka_nixbnl.test
      mysql-test/t/subquery_sj_loosescan_bka_nixbnl.test
      mysql-test/t/subquery_sj_mat_bka_nixbnl.test
      mysql-test/t/subquery_sj_none_bka_nixbnl.test
    modified:
      mysql-test/collections/default.experimental
      mysql-test/include/subquery_sj.inc
      mysql-test/r/subquery_sj_all.result
      mysql-test/r/subquery_sj_all_bka.result
      mysql-test/r/subquery_sj_all_bkaunique.result
      mysql-test/r/subquery_sj_dupsweed.result
      mysql-test/r/subquery_sj_dupsweed_bka.result
      mysql-test/r/subquery_sj_dupsweed_bkaunique.result
      mysql-test/r/subquery_sj_firstmatch.result
      mysql-test/r/subquery_sj_firstmatch_bka.result
      mysql-test/r/subquery_sj_firstmatch_bkaunique.result
      mysql-test/r/subquery_sj_loosescan.result
      mysql-test/r/subquery_sj_loosescan_bka.result
      mysql-test/r/subquery_sj_loosescan_bkaunique.result
      mysql-test/r/subquery_sj_mat.result
      mysql-test/r/subquery_sj_mat_bka.result
      mysql-test/r/subquery_sj_mat_bkaunique.result
      mysql-test/r/subquery_sj_mat_nosj.result
      mysql-test/r/subquery_sj_none.result
      mysql-test/r/subquery_sj_none_bka.result
      mysql-test/r/subquery_sj_none_bkaunique.result
      mysql-test/suite/opt_trace/r/general_no_prot_all.result
      mysql-test/suite/opt_trace/r/general_ps_prot_all.result
      sql/sql_select.cc
      sql/sql_select.h
      support-files/mysql.spec.sh
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (marko.makela:3475 to 3476) marko.makela5 Oct