From: Oystein Grovlen Date: August 17 2011 8:56am Subject: bzr push into mysql-trunk branch (oystein.grovlen:3399 to 3402) WL#5285 List-Archive: http://lists.mysql.com/commits/140664 Message-Id: <201108170856.p7H8uetW007341@khepri24.local> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3402 Oystein Grovlen 2011-08-17 WL#5285 - Simplify user visible setting for optimizer_join_cache_level Addendum: Change ordering of optimizer_switch constants Update result files @ mysql-test/r/index_merge_myisam.result New ordering of optimizer_switch flags. @ mysql-test/r/mysqld--help-notwin.result New ordering of optimizer_switch flags. @ mysql-test/r/mysqld--help-win.result New ordering of optimizer_switch flags. @ mysql-test/r/optimizer_switch.result New ordering of optimizer_switch flags. @ mysql-test/suite/opt_trace/r/general_ps_prot_all.result Update result files with new EXPLAIN text for BNL. @ mysql-test/suite/opt_trace/r/general_ps_prot_none.result Update result files with new EXPLAIN text for BNL. @ mysql-test/suite/sys_vars/r/optimizer_switch_basic.result New ordering of optimizer_switch flags. @ sql/sql_priv.h There can be no "holes" in optimizer_switch constans. Hence, those not yet defined in trunk has to come last. @ sql/sys_vars.cc New ordering of optimizer_switch flags. modified: mysql-test/r/index_merge_myisam.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/optimizer_switch.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/optimizer_switch_basic.result sql/sql_priv.h sql/sys_vars.cc 3401 Oystein Grovlen 2011-08-08 [merge] Merge mysql-next-mr-opt-backporting => mysql-wl5285 (Only conflicts in join_cache* result files) added: mysql-test/suite/perfschema/include/stage_cleanup.inc mysql-test/suite/perfschema/include/stage_setup.inc mysql-test/suite/perfschema/r/stage_mdl_function.result mysql-test/suite/perfschema/r/stage_mdl_global.result mysql-test/suite/perfschema/r/stage_mdl_procedure.result mysql-test/suite/perfschema/r/stage_mdl_table.result mysql-test/suite/perfschema/t/stage_mdl_function.test mysql-test/suite/perfschema/t/stage_mdl_global.test mysql-test/suite/perfschema/t/stage_mdl_procedure.test mysql-test/suite/perfschema/t/stage_mdl_table.test mysql-test/suite/sys_vars/t/innodb_buffer_pool_filename_basic-master.opt renamed: mysql-test/suite/sys_vars/r/default_temp_storage_engine_basic.result => mysql-test/suite/sys_vars/r/default_tmp_storage_engine_basic.result mysql-test/suite/sys_vars/t/default_temp_storage_engine_basic.test => mysql-test/suite/sys_vars/t/default_tmp_storage_engine_basic.test modified: client/mysql.cc client/mysql_upgrade.c client/mysqladmin.cc client/mysqlcheck.c client/mysqldump.c client/mysqlimport.c client/mysqlshow.c client/mysqltest.cc client/readline.cc cmake/create_initial_db.cmake.in config.h.cmake configure.cmake dbug/dbug_analyze.c dbug/my_main.c dbug/tests.c include/my_sys.h libmysqld/emb_qcache.cc libmysqld/lib_sql.cc mysql-test/collections/default.experimental mysql-test/collections/default.weekly mysql-test/include/icp_tests.inc mysql-test/include/join_cache.inc mysql-test/include/mix1.inc mysql-test/include/mrr_tests.inc mysql-test/include/range.inc mysql-test/lib/mtr_cases.pm mysql-test/mysql-test-run.pl mysql-test/r/func_if.result mysql-test/r/func_str.result mysql-test/r/func_time.result mysql-test/r/information_schema-big.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_cache_bka.result mysql-test/r/join_cache_bka_nobnl.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/merge.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/mysql_binary_mode.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/parser.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/signal.result mysql-test/r/signal_demo3.result mysql-test/r/sp-big.result mysql-test/r/sp-bugs.result mysql-test/r/sp-code.result mysql-test/r/sp-error.result mysql-test/r/sp.result mysql-test/r/sp_trans.result mysql-test/r/strict.result mysql-test/r/view.result mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam-master.opt mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam-master.opt mysql-test/suite/engines/funcs/r/sf_alter.result mysql-test/suite/engines/funcs/r/sf_cursor.result mysql-test/suite/engines/funcs/r/sp_alter.result mysql-test/suite/engines/funcs/r/sp_cursor.result mysql-test/suite/funcs_1/r/innodb_storedproc_02.result mysql-test/suite/funcs_1/r/memory_storedproc_02.result mysql-test/suite/funcs_1/r/myisam_storedproc_02.result mysql-test/suite/funcs_1/r/storedproc.result mysql-test/suite/innodb/r/innodb-analyze.result mysql-test/suite/innodb/r/innodb_bug54044.result mysql-test/suite/innodb/r/innodb_mysql.result mysql-test/suite/innodb/t/innodb-analyze.test mysql-test/suite/innodb/t/innodb_bug54044.test mysql-test/suite/perfschema/include/event_aggregate_cleanup.inc mysql-test/suite/perfschema/include/event_aggregate_load.inc mysql-test/suite/perfschema/include/event_aggregate_setup.inc mysql-test/suite/perfschema/include/table_aggregate_cleanup.inc mysql-test/suite/perfschema/include/table_aggregate_load.inc mysql-test/suite/perfschema/include/table_aggregate_setup.inc mysql-test/suite/perfschema/include/table_io_setup_helper.inc mysql-test/suite/perfschema/r/csv_table_io.result mysql-test/suite/perfschema/r/event_aggregate.result mysql-test/suite/perfschema/r/indexed_table_io.result mysql-test/suite/perfschema/r/innodb_table_io.result mysql-test/suite/perfschema/r/memory_table_io.result mysql-test/suite/perfschema/r/merge_table_io.result mysql-test/suite/perfschema/r/multi_table_io.result mysql-test/suite/perfschema/r/myisam_table_io.result mysql-test/suite/perfschema/r/ortho_iter.result mysql-test/suite/perfschema/r/part_table_io.result mysql-test/suite/perfschema/r/privilege_table_io.result mysql-test/suite/perfschema/r/query_cache.result mysql-test/suite/perfschema/r/rollback_table_io.result mysql-test/suite/perfschema/r/setup_objects.result mysql-test/suite/perfschema/r/start_server_innodb.result mysql-test/suite/perfschema/r/start_server_no_cond_class.result mysql-test/suite/perfschema/r/start_server_no_cond_inst.result mysql-test/suite/perfschema/r/start_server_no_file_class.result mysql-test/suite/perfschema/r/start_server_no_file_inst.result mysql-test/suite/perfschema/r/start_server_no_mutex_class.result mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result mysql-test/suite/perfschema/r/start_server_no_setup_actors.result mysql-test/suite/perfschema/r/start_server_no_setup_objects.result mysql-test/suite/perfschema/r/start_server_no_stages_history.result mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result mysql-test/suite/perfschema/r/start_server_no_statement_class.result mysql-test/suite/perfschema/r/start_server_no_statements_history.result mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result mysql-test/suite/perfschema/r/start_server_no_table_hdl.result mysql-test/suite/perfschema/r/start_server_no_table_inst.result mysql-test/suite/perfschema/r/start_server_no_thread_class.result mysql-test/suite/perfschema/r/start_server_no_thread_inst.result mysql-test/suite/perfschema/r/start_server_off.result mysql-test/suite/perfschema/r/start_server_on.result mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result mysql-test/suite/perfschema/r/table_aggregate_off.result mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result mysql-test/suite/perfschema/r/temp_table_io.result mysql-test/suite/perfschema/r/trigger_table_io.result mysql-test/suite/perfschema/r/view_table_io.result mysql-test/suite/perfschema/t/setup_objects.test mysql-test/suite/rpl/r/rpl_row_sp005.result mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result mysql-test/suite/sys_vars/r/all_vars.result mysql-test/suite/sys_vars/r/innodb_buffer_pool_filename_basic.result mysql-test/suite/sys_vars/r/innodb_stats_sample_pages_basic.result mysql-test/suite/sys_vars/t/innodb_buffer_pool_filename_basic.test mysql-test/t/bootstrap-master.opt mysql-test/t/bootstrap.test mysql-test/t/ctype_utf8mb4-master.opt mysql-test/t/func_if.test mysql-test/t/func_str.test mysql-test/t/func_time.test mysql-test/t/merge.test mysql-test/t/mysql_binary_mode.test mysql-test/t/parser.test mysql-test/t/sp-error.test mysql-test/t/sp.test mysys/my_init.c mysys/my_static.c mysys/mysys_priv.h mysys/thr_lock.c plugin/semisync/semisync_master.cc plugin/semisync/semisync_master.h plugin/semisync/semisync_master_plugin.cc sql/CMakeLists.txt sql/binlog.cc sql/debug_sync.cc sql/event_data_objects.cc sql/event_db_repository.cc sql/event_parse_data.cc sql/event_queue.cc sql/event_queue.h sql/event_scheduler.cc sql/event_scheduler.h sql/events.cc sql/events.h sql/field.cc sql/field.h sql/field_conv.cc sql/gen_lex_hash.cc sql/ha_ndbcluster.cc sql/ha_ndbcluster_binlog.cc sql/ha_ndbcluster_cond.cc sql/handler.cc sql/handler.h sql/item.cc sql/item_cmpfunc.cc sql/item_cmpfunc.h sql/item_func.cc sql/item_geofunc.cc sql/item_strfunc.cc sql/item_subselect.cc sql/item_sum.cc sql/item_timefunc.cc sql/item_xmlfunc.cc sql/log.cc sql/log_event.cc sql/mdl.cc sql/mdl.h sql/my_decimal.cc sql/mysqld.cc sql/mysqld.h sql/opt_explain.cc sql/opt_range.cc sql/partition_info.cc sql/protocol.cc sql/replication.h sql/rpl_master.cc sql/rpl_record.cc sql/rpl_reporting.cc sql/rpl_rli.cc sql/rpl_slave.cc sql/set_var.cc sql/sp.cc sql/sp_head.cc sql/sp_head.h sql/sp_pcontext.cc sql/sp_pcontext.h sql/sp_rcontext.cc sql/sp_rcontext.h sql/sql_acl.cc sql/sql_admin.cc sql/sql_alloc_error_handler.cc sql/sql_alter.cc sql/sql_audit.h sql/sql_base.cc sql/sql_base.h sql/sql_cache.cc sql/sql_class.cc sql/sql_class.h sql/sql_db.cc sql/sql_error.cc sql/sql_error.h sql/sql_handler.cc sql/sql_insert.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_load.cc sql/sql_locale.cc sql/sql_parse.cc sql/sql_partition.cc sql/sql_plugin.cc sql/sql_prepare.cc sql/sql_prepare.h sql/sql_priv.h sql/sql_select.cc sql/sql_servers.cc sql/sql_show.cc sql/sql_signal.cc sql/sql_signal.h sql/sql_table.cc sql/sql_table.h sql/sql_tablespace.cc sql/sql_time.cc sql/sql_time.h sql/sql_trigger.cc sql/sql_update.cc sql/sql_view.cc sql/sql_yacc.yy sql/sys_vars.cc sql/table.cc sql/unireg.cc storage/innobase/fil/fil0fil.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/handler0alter.cc storage/innobase/handler/i_s.cc storage/innobase/include/srv0srv.h storage/innobase/include/sync0sync.h storage/innobase/include/trx0sys.h storage/innobase/include/trx0sys.ic storage/innobase/include/trx0trx.h storage/innobase/include/trx0trx.ic storage/innobase/lock/lock0lock.c storage/innobase/read/read0read.c storage/innobase/row/row0ins.c storage/innobase/row/row0row.c storage/innobase/row/row0vers.c storage/innobase/srv/srv0srv.c storage/innobase/sync/sync0sync.c storage/innobase/trx/trx0i_s.c storage/innobase/trx/trx0purge.c storage/innobase/trx/trx0roll.c storage/innobase/trx/trx0rseg.c storage/innobase/trx/trx0sys.c storage/innobase/trx/trx0trx.c storage/innobase/trx/trx0undo.c storage/myisammrg/ha_myisammrg.cc storage/myisammrg/myrg_open.c storage/perfschema/pfs_instr_class.cc storage/perfschema/pfs_server.h support-files/mysql.spec.sh unittest/gunit/CMakeLists.txt unittest/gunit/opt_trace-t.cc unittest/gunit/test_mdl_context_owner.h unittest/gunit/test_utils.cc unittest/gunit/test_utils.h mysql-test/suite/sys_vars/r/default_tmp_storage_engine_basic.result mysql-test/suite/sys_vars/t/default_tmp_storage_engine_basic.test 3400 Oystein Grovlen 2011-08-04 BUG#12827509 - BNL/BKA: SELECT LEFT/RIGHT JOIN QUERY GIVES DIFFERENT OUTPUT ON BNL=OFF+BKA=ON This is a test case for a duplicate of 12722133. This test case is added because it fails for a different combination of optimizer_switch settings for block_nested_loop and batch_key_access. @ mysql-test/include/join_cache.inc Added test case for Bug#12827509. @ mysql-test/r/join_cache_bka.result Results for test case for Bug#12827509. @ mysql-test/r/join_cache_bka_nobnl.result Results for test case for Bug#12827509. @ mysql-test/r/join_cache_bkaunique.result Results for test case for Bug#12827509. @ mysql-test/r/join_cache_bnl.result Results for test case for Bug#12827509. @ mysql-test/r/join_cache_nojb.result Results for test case for Bug#12827509. modified: mysql-test/include/join_cache.inc mysql-test/r/join_cache_bka.result mysql-test/r/join_cache_bka_nobnl.result mysql-test/r/join_cache_bkaunique.result mysql-test/r/join_cache_bnl.result mysql-test/r/join_cache_nojb.result 3399 Oystein Grovlen 2011-08-03 [merge] Null merge from mysql-wl5285 to local tree. (Changes already merged from mysql-next-mr-opt-backporting) Diff too large for email (41274 lines, the limit is 10000). No bundle (reason: useless for push emails).