From: Oystein Grovlen Date: August 17 2011 10:32am Subject: bzr push into mysql-trunk branch (oystein.grovlen:3421 to 3422) List-Archive: http://lists.mysql.com/commits/140670 Message-Id: <201108171032.p7HAWAvb027681@khepri24.local> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3422 Oystein Grovlen 2011-08-17 [merge] Merge mysql-wl5285 => mysql-next-mr-opt-backporting No conflicts. Re-recorded some *bka_nobnl.result files due to a new test case. removed: mysql-test/include/have_join_cache_level.inc 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_jcl5.result mysql-test/r/join_cache_jcl8.result mysql-test/suite/sys_vars/r/optimizer_join_cache_level_basic.result mysql-test/suite/sys_vars/t/optimizer_join_cache_level_basic.test mysql-test/t/join_cache_jcl1.test mysql-test/t/join_cache_jcl2.test mysql-test/t/join_cache_jcl3.test mysql-test/t/join_cache_jcl5.test mysql-test/t/join_cache_jcl8.test added: 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 renamed: mysql-test/r/join_cache_jcl0.result => mysql-test/r/join_cache_nojb.result mysql-test/r/join_cache_jcl4.result => mysql-test/r/join_cache_bnl.result mysql-test/r/join_cache_jcl6.result => mysql-test/r/join_cache_bka.result mysql-test/r/join_cache_jcl7.result => mysql-test/r/join_cache_bkaunique.result mysql-test/r/join_nested_jcl6.result => mysql-test/r/join_nested_bka.result mysql-test/r/join_outer_jcl6.result => mysql-test/r/join_outer_bka.result mysql-test/r/select_all_jcl6.result => mysql-test/r/select_all_bka.result mysql-test/r/select_icp_mrr_jcl6.result => mysql-test/r/select_icp_mrr_bka.result mysql-test/r/select_none_jcl6.result => mysql-test/r/select_none_bka.result mysql-test/r/subquery_all_jcl6.result => mysql-test/r/subquery_all_bka.result mysql-test/r/subquery_nomat_nosj_jcl6.result => mysql-test/r/subquery_nomat_nosj_bka.result mysql-test/r/subquery_none_jcl6.result => mysql-test/r/subquery_none_bka.result mysql-test/r/subquery_sj_all_jcl6.result => mysql-test/r/subquery_sj_all_bka.result mysql-test/r/subquery_sj_all_jcl7.result => mysql-test/r/subquery_sj_all_bkaunique.result mysql-test/r/subquery_sj_dupsweed_jcl6.result => mysql-test/r/subquery_sj_dupsweed_bka.result mysql-test/r/subquery_sj_dupsweed_jcl7.result => mysql-test/r/subquery_sj_dupsweed_bkaunique.result mysql-test/r/subquery_sj_firstmatch_jcl6.result => mysql-test/r/subquery_sj_firstmatch_bka.result mysql-test/r/subquery_sj_firstmatch_jcl7.result => mysql-test/r/subquery_sj_firstmatch_bkaunique.result mysql-test/r/subquery_sj_innodb_all_jcl6.result => mysql-test/r/subquery_sj_innodb_all_bka.result mysql-test/r/subquery_sj_innodb_all_jcl7.result => mysql-test/r/subquery_sj_innodb_all_bkaunique.result mysql-test/r/subquery_sj_innodb_none_jcl6.result => mysql-test/r/subquery_sj_innodb_none_bka.result mysql-test/r/subquery_sj_innodb_none_jcl7.result => mysql-test/r/subquery_sj_innodb_none_bkaunique.result mysql-test/r/subquery_sj_loosescan_jcl6.result => mysql-test/r/subquery_sj_loosescan_bka.result mysql-test/r/subquery_sj_loosescan_jcl7.result => mysql-test/r/subquery_sj_loosescan_bkaunique.result mysql-test/r/subquery_sj_mat_jcl6.result => mysql-test/r/subquery_sj_mat_bka.result mysql-test/r/subquery_sj_mat_jcl7.result => mysql-test/r/subquery_sj_mat_bkaunique.result mysql-test/r/subquery_sj_none_jcl6.result => mysql-test/r/subquery_sj_none_bka.result mysql-test/r/subquery_sj_none_jcl7.result => mysql-test/r/subquery_sj_none_bkaunique.result mysql-test/t/join_cache_jcl0.test => mysql-test/t/join_cache_nojb.test mysql-test/t/join_cache_jcl4.test => mysql-test/t/join_cache_bnl.test mysql-test/t/join_cache_jcl6.test => mysql-test/t/join_cache_bka.test mysql-test/t/join_cache_jcl7.test => mysql-test/t/join_cache_bkaunique.test mysql-test/t/join_nested_jcl6.test => mysql-test/t/join_nested_bka.test mysql-test/t/join_outer_jcl6.test => mysql-test/t/join_outer_bka.test mysql-test/t/select_all_jcl6.test => mysql-test/t/select_all_bka.test mysql-test/t/select_icp_mrr_jcl6.test => mysql-test/t/select_icp_mrr_bka.test mysql-test/t/select_none_jcl6.test => mysql-test/t/select_none_bka.test mysql-test/t/subquery_all_jcl6.test => mysql-test/t/subquery_all_bka.test mysql-test/t/subquery_nomat_nosj_jcl6.test => mysql-test/t/subquery_nomat_nosj_bka.test mysql-test/t/subquery_none_jcl6.test => mysql-test/t/subquery_none_bka.test mysql-test/t/subquery_sj_all_jcl6.test => mysql-test/t/subquery_sj_all_bka.test mysql-test/t/subquery_sj_all_jcl7.test => mysql-test/t/subquery_sj_all_bkaunique.test mysql-test/t/subquery_sj_dupsweed_jcl6.test => mysql-test/t/subquery_sj_dupsweed_bka.test mysql-test/t/subquery_sj_dupsweed_jcl7.test => mysql-test/t/subquery_sj_dupsweed_bkaunique.test mysql-test/t/subquery_sj_firstmatch_jcl6.test => mysql-test/t/subquery_sj_firstmatch_bka.test mysql-test/t/subquery_sj_firstmatch_jcl7.test => mysql-test/t/subquery_sj_firstmatch_bkaunique.test mysql-test/t/subquery_sj_innodb_all_jcl6.test => mysql-test/t/subquery_sj_innodb_all_bka.test mysql-test/t/subquery_sj_innodb_all_jcl7.test => mysql-test/t/subquery_sj_innodb_all_bkaunique.test mysql-test/t/subquery_sj_innodb_none_jcl6.test => mysql-test/t/subquery_sj_innodb_none_bka.test mysql-test/t/subquery_sj_innodb_none_jcl7.test => mysql-test/t/subquery_sj_innodb_none_bkaunique.test mysql-test/t/subquery_sj_loosescan_jcl6.test => mysql-test/t/subquery_sj_loosescan_bka.test mysql-test/t/subquery_sj_loosescan_jcl7.test => mysql-test/t/subquery_sj_loosescan_bkaunique.test mysql-test/t/subquery_sj_mat_jcl6.test => mysql-test/t/subquery_sj_mat_bka.test mysql-test/t/subquery_sj_mat_jcl7.test => mysql-test/t/subquery_sj_mat_bkaunique.test mysql-test/t/subquery_sj_none_jcl6.test => mysql-test/t/subquery_sj_none_bka.test mysql-test/t/subquery_sj_none_jcl7.test => mysql-test/t/subquery_sj_none_bkaunique.test modified: mysql-test/include/join_cache.inc mysql-test/include/mrr_tests.inc mysql-test/r/archive_gis.result mysql-test/r/compress.result mysql-test/r/ctype_utf8.result mysql-test/r/ctype_utf8mb4.result mysql-test/r/ctype_utf8mb4_heap.result mysql-test/r/ctype_utf8mb4_innodb.result mysql-test/r/ctype_utf8mb4_myisam.result mysql-test/r/derived.result mysql-test/r/distinct.result mysql-test/r/error_simulation.result mysql-test/r/explain.result mysql-test/r/func_gconcat.result mysql-test/r/func_group.result mysql-test/r/func_group_innodb.result mysql-test/r/func_str.result mysql-test/r/gis.result mysql-test/r/grant_explain_non_select.result mysql-test/r/greedy_optimizer.result mysql-test/r/group_by.result mysql-test/r/group_min_max.result mysql-test/r/index_merge_myisam.result mysql-test/r/information_schema.result mysql-test/r/innodb_explain_non_select_all.result mysql-test/r/innodb_explain_non_select_none.result mysql-test/r/innodb_icp.result mysql-test/r/innodb_icp_all.result mysql-test/r/innodb_icp_none.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.result mysql-test/r/join_nested.result mysql-test/r/join_outer.result mysql-test/r/key_diff.result mysql-test/r/myisam.result mysql-test/r/myisam_explain_non_select_all.result mysql-test/r/myisam_explain_non_select_none.result mysql-test/r/myisam_icp.result mysql-test/r/myisam_icp_all.result mysql-test/r/myisam_icp_none.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/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/named_pipe.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/optimizer_switch.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/ps.result mysql-test/r/range_all.result mysql-test/r/range_icp.result mysql-test/r/range_icp_mrr.result mysql-test/r/range_mrr.result mysql-test/r/range_mrr_cost.result mysql-test/r/range_none.result mysql-test/r/row.result mysql-test/r/select_all.result mysql-test/r/select_icp_mrr.result mysql-test/r/select_none.result mysql-test/r/shm.result mysql-test/r/ssl.result mysql-test/r/ssl_compress.result mysql-test/r/subquery_all.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_none.result mysql-test/r/subquery_sj_all.result mysql-test/r/subquery_sj_dupsweed.result mysql-test/r/subquery_sj_firstmatch.result mysql-test/r/subquery_sj_innodb_none.result mysql-test/r/subquery_sj_loosescan.result mysql-test/r/subquery_sj_mat.result mysql-test/r/subquery_sj_mat_nosj.result mysql-test/r/subquery_sj_none.result mysql-test/r/subselect_innodb.result mysql-test/r/union.result mysql-test/r/view.result mysql-test/suite/innodb/r/innodb_gis.result mysql-test/suite/innodb/r/innodb_mysql.result mysql-test/suite/innodb/t/innodb_mysql.test 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/sys_vars/r/max_seeks_for_key_func.result mysql-test/suite/sys_vars/r/optimizer_switch_basic.result mysql-test/t/subquery_sj_firstmatch.test sql/opt_explain.cc sql/sql_class.h sql/sql_priv.h sql/sql_select.cc sql/sql_select.h sql/sys_vars.cc mysql-test/r/join_cache_nojb.result mysql-test/r/join_cache_bnl.result mysql-test/r/join_cache_bka.result mysql-test/r/join_cache_bkaunique.result mysql-test/r/join_nested_bka.result mysql-test/r/join_outer_bka.result mysql-test/r/select_all_bka.result mysql-test/r/select_icp_mrr_bka.result mysql-test/r/select_none_bka.result mysql-test/r/subquery_all_bka.result mysql-test/r/subquery_nomat_nosj_bka.result mysql-test/r/subquery_none_bka.result mysql-test/r/subquery_sj_all_bka.result mysql-test/r/subquery_sj_all_bkaunique.result mysql-test/r/subquery_sj_dupsweed_bka.result mysql-test/r/subquery_sj_dupsweed_bkaunique.result mysql-test/r/subquery_sj_firstmatch_bka.result mysql-test/r/subquery_sj_firstmatch_bkaunique.result mysql-test/r/subquery_sj_innodb_all_bka.result mysql-test/r/subquery_sj_innodb_all_bkaunique.result mysql-test/r/subquery_sj_innodb_none_bka.result mysql-test/r/subquery_sj_innodb_none_bkaunique.result mysql-test/r/subquery_sj_loosescan_bka.result mysql-test/r/subquery_sj_loosescan_bkaunique.result mysql-test/r/subquery_sj_mat_bka.result mysql-test/r/subquery_sj_mat_bkaunique.result mysql-test/r/subquery_sj_none_bka.result mysql-test/r/subquery_sj_none_bkaunique.result mysql-test/t/join_cache_nojb.test mysql-test/t/join_cache_bnl.test mysql-test/t/join_cache_bka.test mysql-test/t/join_cache_bkaunique.test mysql-test/t/join_nested_bka.test mysql-test/t/join_outer_bka.test mysql-test/t/select_all_bka.test mysql-test/t/select_icp_mrr_bka.test mysql-test/t/select_none_bka.test mysql-test/t/subquery_all_bka.test mysql-test/t/subquery_nomat_nosj_bka.test mysql-test/t/subquery_none_bka.test mysql-test/t/subquery_sj_all_bka.test mysql-test/t/subquery_sj_all_bkaunique.test mysql-test/t/subquery_sj_dupsweed_bka.test mysql-test/t/subquery_sj_dupsweed_bkaunique.test mysql-test/t/subquery_sj_firstmatch_bka.test mysql-test/t/subquery_sj_firstmatch_bkaunique.test mysql-test/t/subquery_sj_innodb_all_bka.test mysql-test/t/subquery_sj_innodb_all_bkaunique.test mysql-test/t/subquery_sj_innodb_none_bka.test mysql-test/t/subquery_sj_innodb_none_bkaunique.test mysql-test/t/subquery_sj_loosescan_bka.test mysql-test/t/subquery_sj_loosescan_bkaunique.test mysql-test/t/subquery_sj_mat_bka.test mysql-test/t/subquery_sj_mat_bkaunique.test mysql-test/t/subquery_sj_none_bka.test mysql-test/t/subquery_sj_none_bkaunique.test 3421 Jorgen Loland 2011-08-15 Recorded result files after merge mysql-trunk -> opt-backporting 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 Diff too large for email (137953 lines, the limit is 10000). No bundle (reason: useless for push emails).