From: Ole John Aske Date: February 16 2012 12:57pm Subject: bzr push into mysql-trunk branch (ole.john.aske:3860 to 3861) List-Archive: http://lists.mysql.com/commits/142918 Message-Id: <20120216125755.448EB23A@fimafeng09.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3861 Ole John Aske 2012-02-16 [merge] Re-merged with current mysql-trunk on request from Roel added: include/my_rnd.h mysql-test/r/archive_no_symlink.result mysql-test/r/archive_symlink.result mysql-test/r/bug33509.result mysql-test/r/debug_sync2.result mysql-test/suite/innodb/r/innodb-index-debug.result mysql-test/suite/innodb/r/innodb_bug-13628249.result mysql-test/suite/innodb/t/innodb-index-debug.test mysql-test/suite/innodb/t/innodb_bug-13628249.test mysql-test/suite/sys_vars/r/innodb_max_purge_lag_delay_basic.result mysql-test/suite/sys_vars/t/innodb_max_purge_lag_delay_basic.test mysql-test/t/archive_no_symlink-master.opt mysql-test/t/archive_no_symlink.test mysql-test/t/archive_symlink.test mysql-test/t/bug33509.test mysql-test/t/debug_sync2-master.opt mysql-test/t/debug_sync2.test mysql-test/t/subquery_sj_all-master.opt mysql-test/t/subquery_sj_all_bka-master.opt mysql-test/t/subquery_sj_all_bka_nixbnl-master.opt mysql-test/t/subquery_sj_all_bkaunique-master.opt mysql-test/t/subquery_sj_dupsweed-master.opt mysql-test/t/subquery_sj_dupsweed_bka-master.opt mysql-test/t/subquery_sj_dupsweed_bka_nixbnl-master.opt mysql-test/t/subquery_sj_dupsweed_bkaunique-master.opt mysql-test/t/subquery_sj_firstmatch-master.opt mysql-test/t/subquery_sj_firstmatch_bka-master.opt sql/global_threads.h sql/my_rnd.cc modified: client/mysqldump.c include/CMakeLists.txt include/m_ctype.h include/my_base.h include/my_bitmap.h include/my_global.h include/my_sys.h include/myisam.h include/mysql/psi/mysql_socket.h include/mysql/psi/mysql_table.h include/mysql/psi/mysql_thread.h include/mysql/psi/psi.h include/mysql/psi/psi_abi_v1.h include/mysql_time.h include/sql_common.h include/sslopt-case.h include/sslopt-longopts.h include/sslopt-vars.h include/violite.h include/waiting_threads.h include/welcome_copyright_notice.h libmysql/CMakeLists.txt mysql-test/collections/default.experimental mysql-test/extra/rpl_tests/rpl_insert_id_pk.test mysql-test/extra/rpl_tests/rpl_multi_update.test mysql-test/extra/rpl_tests/rpl_multi_update2.test mysql-test/extra/rpl_tests/rpl_multi_update3.test mysql-test/include/icp_tests.inc mysql-test/include/index_merge1.inc 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/mysql-test-run.pl mysql-test/r/create-big.result mysql-test/r/derived.result mysql-test/r/events_restart.result mysql-test/r/group_by.result mysql-test/r/heap.result mysql-test/r/index_merge_myisam.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_mysql_sync.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/lock.result mysql-test/r/multi_update.result mysql-test/r/myisam_icp.result mysql-test/r/myisam_icp_all.result mysql-test/r/myisam_icp_none.result mysql-test/r/ps.result mysql-test/r/ps_2myisam.result mysql-test/r/ps_3innodb.result mysql-test/r/ps_4heap.result mysql-test/r/ps_5merge.result mysql-test/r/query_cache.result mysql-test/r/read_only.result mysql-test/r/sp-code.result mysql-test/r/subquery_all.result mysql-test/r/subquery_all_bka.result mysql-test/r/subquery_all_bka_nixbnl.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_bka.result mysql-test/r/subquery_nomat_nosj_bka_nixbnl.result mysql-test/r/subquery_none.result mysql-test/r/subquery_none_bka.result mysql-test/r/subquery_none_bka_nixbnl.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/type_blob.result mysql-test/r/type_temporal_fractional.result mysql-test/r/type_time.result mysql-test/suite/binlog/r/binlog_unsafe.result mysql-test/suite/binlog/t/binlog_unsafe.test mysql-test/suite/engines/funcs/r/datetime_function.result mysql-test/suite/engines/funcs/r/ld_all_number_string_calendar_types.result mysql-test/suite/funcs_1/r/myisam_views-big.result mysql-test/suite/innodb/r/innodb_monitor.result mysql-test/suite/innodb/r/innodb_mysql.result mysql-test/suite/innodb/t/innodb-index.test mysql-test/suite/innodb/t/innodb_bug53756.test mysql-test/suite/opt_trace/include/general.inc mysql-test/suite/opt_trace/include/general2.inc mysql-test/suite/opt_trace/include/subquery.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/filesort_pq.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/security_no_prot.result mysql-test/suite/opt_trace/r/security_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/opt_trace/r/temp_table.result mysql-test/suite/opt_trace/t/temp_table.test mysql-test/suite/perfschema/r/threads_innodb.result mysql-test/suite/rpl/r/rpl_auto_increment_11932.result mysql-test/suite/rpl/r/rpl_corruption.result mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result mysql-test/suite/rpl/r/rpl_insert_id_pk.result mysql-test/suite/rpl/r/rpl_known_bugs_detection.result mysql-test/suite/rpl/r/rpl_multi_update.result mysql-test/suite/rpl/r/rpl_multi_update2.result mysql-test/suite/rpl/r/rpl_multi_update3.result mysql-test/suite/rpl/r/rpl_parallel_temp_query.result mysql-test/suite/rpl/r/rpl_rotate_logs.result mysql-test/suite/rpl/t/rpl_auto_increment_11932.test mysql-test/suite/rpl/t/rpl_corruption.test mysql-test/suite/rpl/t/rpl_multi_update2.test mysql-test/suite/rpl/t/rpl_multi_update3.test mysql-test/suite/rpl/t/rpl_optimize.test mysql-test/suite/rpl/t/rpl_parallel_temp_query.test mysql-test/suite/rpl/t/rpl_rotate_logs.test mysql-test/suite/rpl/t/rpl_semi_sync_event.test mysql-test/suite/rpl/t/rpl_timezone.test mysql-test/suite/sys_vars/r/innodb_monitor_disable_basic.result mysql-test/suite/sys_vars/r/innodb_monitor_enable_basic.result mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result mysql-test/suite/sys_vars/r/innodb_monitor_reset_basic.result mysql-test/suite/sys_vars/r/innodb_purge_threads_basic.result mysql-test/suite/sys_vars/t/innodb_buffer_pool_filename_basic.test mysql-test/suite/sys_vars/t/innodb_purge_threads_basic.test mysql-test/t/create-big.test mysql-test/t/derived.test mysql-test/t/disabled.def mysql-test/t/events_restart.test mysql-test/t/group_by.test mysql-test/t/heap.test mysql-test/t/innodb_mysql_sync.test mysql-test/t/lock.test mysql-test/t/multi_update.test mysql-test/t/ps.test mysql-test/t/query_cache.test mysql-test/t/read_only.test mysql-test/t/type_blob.test mysql-test/t/type_time.test sql-common/my_time.c sql/CMakeLists.txt sql/debug_sync.cc sql/event_scheduler.cc sql/events.cc sql/field.cc sql/item.cc sql/item.h sql/item_cmpfunc.cc sql/item_cmpfunc.h sql/item_subselect.cc sql/item_subselect.h sql/keycaches.cc sql/keycaches.h sql/lex.h sql/mysqld.cc sql/mysqld.h sql/opt_range.cc sql/password.c sql/rpl_master.cc sql/share/errmsg-utf8.txt sql/signal_handler.cc sql/sql_base.cc sql/sql_class.cc sql/sql_class.h sql/sql_insert.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_list.h sql/sql_optimizer.cc sql/sql_optimizer.h sql/sql_parse.cc sql/sql_partition.cc sql/sql_priv.h sql/sql_resolver.cc sql/sql_select.cc sql/sql_show.cc sql/sql_table.cc sql/sql_test.cc sql/sql_tmp_table.cc sql/sql_union.cc sql/sql_yacc.yy sql/sys_vars.cc sql/table.cc storage/heap/hp_hash.c storage/innobase/dict/dict0stats.cc storage/innobase/handler/ha_innodb.cc storage/innobase/include/ha_prototypes.h storage/innobase/include/log0log.h storage/innobase/include/srv0mon.h storage/innobase/include/srv0srv.h storage/innobase/include/trx0purge.h storage/innobase/lock/lock0lock.cc storage/innobase/log/log0log.cc storage/innobase/log/log0recv.cc storage/innobase/row/row0ins.cc storage/innobase/row/row0merge.cc storage/innobase/row/row0upd.cc storage/innobase/srv/srv0mon.cc storage/innobase/srv/srv0srv.cc storage/innobase/srv/srv0start.cc storage/innobase/trx/trx0purge.cc storage/innobase/trx/trx0roll.cc storage/innobase/trx/trx0sys.cc storage/innobase/trx/trx0trx.cc tests/mysql_client_test.c unittest/gunit/opt_range-t.cc unittest/gunit/sql_list-t.cc vio/vio.c vio/viosocket.c 3860 Ole John Aske 2012-02-09 Followup fix for WL#5558: Resolve ORDER BY execution method at the optimization stage. Changed result files for a few MTR tests requiring '-ps' and as such was not run as part of a plain MTR test. @ mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result Change in optimizer trace as test_if_skip_sort_order() is now done as part of 'optimize' instead of in 'execute' phase. @ mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result Change in optimizer trace as test_if_skip_sort_order() is now done as part of 'optimize' instead of in 'execute' phase. @ mysql-test/suite/opt_trace/r/range_ps_prot.result Change in optimizer trace as test_if_skip_sort_order() is now done as part of 'optimize' instead of in 'execute' phase. modified: 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/range_ps_prot.result Diff too large for email (25369 lines, the limit is 10000). No bundle (reason: useless for push emails).