From: Jon Olav Hauglid Date: January 31 2012 12:46pm Subject: bzr push into mysql-trunk-wl5534 branch (jon.hauglid:3473 to 3474) List-Archive: http://lists.mysql.com/commits/142679 Message-Id: <201201311246.q0VCkL2O016212@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3474 Jon Olav Hauglid 2012-01-31 [merge] Merge from mysql-trunk to mysql-trunk-wl5534 No conflicts added: mysql-test/suite/opt_trace/r/eq_range_statistics.result mysql-test/suite/opt_trace/t/eq_range_statistics.test mysql-test/suite/sys_vars/r/eq_range_index_dive_limit_basic.result mysql-test/suite/sys_vars/t/eq_range_index_dive_limit_basic.test modified: include/my_base.h libmysql/CMakeLists.txt mysql-test/include/func_in.inc mysql-test/include/join_cache.inc mysql-test/include/subquery_mat.inc mysql-test/include/subquery_sj.inc mysql-test/include/wait_for_slave_io_error.inc mysql-test/r/change_user.result mysql-test/r/connect.result mysql-test/r/derived.result mysql-test/r/func_in_all.result mysql-test/r/func_in_icp.result mysql-test/r/func_in_icp_mrr.result mysql-test/r/func_in_mrr.result mysql-test/r/func_in_mrr_cost.result mysql-test/r/func_in_none.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/innodb_icp_all.result mysql-test/r/innodb_mrr_all.result mysql-test/r/innodb_mrr_cost_all.result mysql-test/r/join_cache_bka.result mysql-test/r/join_cache_bka_nixbnl.result mysql-test/r/join_cache_bkaunique.result mysql-test/r/join_cache_bnl.result mysql-test/r/join_cache_nojb.result mysql-test/r/join_nested.result mysql-test/r/join_nested_bka.result mysql-test/r/join_nested_bka_nixbnl.result mysql-test/r/lowercase_fs_off.result mysql-test/r/merge.result mysql-test/r/myisam_explain_non_select_all.result mysql-test/r/mysql_upgrade.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/optimizer_debug_sync.result mysql-test/r/order_by_all.result mysql-test/r/sp-security.result mysql-test/r/sp.result mysql-test/r/subquery_all.result mysql-test/r/subquery_all_bka.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_sj_all.result mysql-test/r/subquery_sj_all_bka.result mysql-test/r/subquery_sj_all_bka_nixbnl.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_bka_nixbnl.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_bka_nixbnl.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_bka_nixbnl.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_bka_nixbnl.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_bka_nixbnl.result mysql-test/r/subquery_sj_none_bkaunique.result mysql-test/r/subselect_innodb.result mysql-test/suite/innodb/r/innodb_mysql.result mysql-test/suite/opt_trace/include/range.inc mysql-test/suite/opt_trace/r/bugs_no_prot_all.result mysql-test/suite/opt_trace/r/bugs_no_prot_none.result mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result mysql-test/suite/opt_trace/r/charset.result mysql-test/suite/opt_trace/r/general2_no_prot.result mysql-test/suite/opt_trace/r/general2_ps_prot.result 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/opt_trace/r/range_no_prot.result mysql-test/suite/opt_trace/r/range_ps_prot.result mysql-test/suite/opt_trace/r/subquery_no_prot.result mysql-test/suite/opt_trace/r/subquery_ps_prot.result mysql-test/suite/parts/inc/partition-dml-1-7.inc mysql-test/suite/parts/inc/partition-dml-1-8.inc mysql-test/suite/parts/inc/partition_key_16col.inc mysql-test/suite/parts/inc/partition_key_32col.inc mysql-test/suite/parts/inc/partition_key_4col.inc mysql-test/suite/parts/inc/partition_key_8col.inc mysql-test/suite/parts/r/partition_special_myisam.result mysql-test/suite/rpl/r/rpl_checksum.result mysql-test/suite/rpl/r/rpl_log_pos.result mysql-test/suite/rpl/r/rpl_manual_change_index_file.result mysql-test/suite/rpl/r/rpl_packet.result mysql-test/suite/rpl/r/rpl_row_event_max_size.result mysql-test/suite/rpl/t/rpl_checksum.test mysql-test/suite/rpl/t/rpl_log_pos.test mysql-test/suite/rpl/t/rpl_manual_change_index_file.test mysql-test/suite/rpl/t/rpl_packet.test mysql-test/suite/rpl/t/rpl_row_event_max_size.test mysql-test/suite/sys_vars/r/old_passwords_func.result mysql-test/suite/sys_vars/r/optimizer_switch_basic.result mysql-test/suite/sys_vars/r/secure_auth_basic.result mysql-test/suite/sys_vars/r/secure_auth_func.result mysql-test/suite/sys_vars/t/secure_auth_basic.test mysql-test/t/change_user.test mysql-test/t/connect.test mysql-test/t/group_by.test mysql-test/t/merge.test mysql-test/t/mysql_upgrade.test mysql-test/t/optimizer_debug_sync.test mysql-test/t/sp-security.test mysql-test/t/sp.test mysql-test/valgrind.supp scripts/mysql_system_tables_fix.sql sql/filesort.cc sql/filesort_utils.h sql/handler.cc sql/item.cc sql/item_cmpfunc.h sql/item_func.cc sql/item_func.h sql/mysqld.cc sql/opt_range.cc sql/sql_acl.cc sql/sql_class.h sql/sql_executor.cc sql/sql_join_buffer.cc sql/sql_join_buffer.h sql/sql_optimizer.cc sql/sql_optimizer.h sql/sql_parse.cc sql/sql_priv.h sql/sql_select.cc sql/structs.h sql/sys_vars.cc sql/table.h storage/innobase/lock/lock0lock.cc storage/innobase/os/os0file.cc storage/myisammrg/ha_myisammrg.cc storage/perfschema/pfs_instr_class.cc storage/perfschema/pfs_instr_class.h storage/perfschema/pfs_server.cc unittest/gunit/filesort_buffer-t.cc 3473 Dmitry Lenev 2012-01-30 WL#5534 Online ALTER, Phase 1. Patch #80: Replaced hack which was used to obtain path to temporary table with a nicer approach. modified: sql/sql_alter.cc sql/sql_alter.h sql/sql_base.cc sql/sql_base.h sql/sql_insert.cc sql/sql_partition.cc sql/sql_partition.h sql/sql_table.cc sql/sql_table.h Diff too large for email (10316 lines, the limit is 10000). No bundle (reason: useless for push emails).