List:Commits« Previous MessageNext Message »
From:Tor Didriksen Date:December 3 2010 9:20am
Subject:bzr push into mysql-trunk-bugfixing branch (tor.didriksen:3293 to 3311)
View as plain text  
 3311 Tor Didriksen	2010-12-03 [merge]
      Automerge trunk-bugfixing => opt-backporting

 3310 Tor Didriksen	2010-12-03 [merge]
      Merge trunk-bugfixing => opt-backporting

    modified:
      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_jcl4.test
 3309 Tor Didriksen	2010-12-02 [merge]
      Empty merge trunk-bugfixing => opt-backporting

 3308 Tor Didriksen	2010-12-02 [merge]
      NULL merge trunk-bugfixing => opt-backporting

 3307 Tor Didriksen	2010-12-02 [merge]
      Empty merge trunk-bugfixing => opt-backporting

 3306 Tor Didriksen	2010-12-02 [merge]
      Automerge trunk-bugfixing => opt-backporting

    added:
      mysql-test/collections/mysql-next-mr-wl2540.push
      mysql-test/collections/mysql-trunk.daily
      mysql-test/collections/mysql-trunk.weekly
      mysql-test/include/have_binlog_checksum_off.inc
      mysql-test/r/mysqld--defaults-file.result
      mysql-test/suite/binlog/r/binlog_checksum.result
      mysql-test/suite/binlog/t/binlog_checksum.test
      mysql-test/suite/federated/federated_bug_35333.result
      mysql-test/suite/federated/federated_bug_35333.test
      mysql-test/suite/perfschema/r/dml_threads.result
      mysql-test/suite/perfschema/r/thread_cache.result
      mysql-test/suite/perfschema/t/dml_threads.test
      mysql-test/suite/perfschema/t/thread_cache.test
      mysql-test/suite/rpl/extension/README.checksum
      mysql-test/suite/rpl/extension/checksum.pl
      mysql-test/suite/rpl/r/rpl_checksum.result
      mysql-test/suite/rpl/r/rpl_checksum_cache.result
      mysql-test/suite/rpl/r/rpl_corruption.result
      mysql-test/suite/rpl/r/rpl_slave_start.result
      mysql-test/suite/rpl/t/rpl_checksum-master.opt
      mysql-test/suite/rpl/t/rpl_checksum.test
      mysql-test/suite/rpl/t/rpl_checksum_cache.test
      mysql-test/suite/rpl/t/rpl_corruption-master.opt
      mysql-test/suite/rpl/t/rpl_corruption-slave.opt
      mysql-test/suite/rpl/t/rpl_corruption.test
      mysql-test/suite/rpl/t/rpl_slave_start.test
      mysql-test/suite/sys_vars/r/binlog_checksum_basic.result
      mysql-test/suite/sys_vars/r/master_verify_checksum_basic.result
      mysql-test/suite/sys_vars/r/slave_sql_verify_checksum_basic.result
      mysql-test/suite/sys_vars/t/binlog_checksum_basic.test
      mysql-test/suite/sys_vars/t/master_verify_checksum_basic.test
      mysql-test/suite/sys_vars/t/slave_sql_verify_checksum_basic.test
      mysql-test/t/mysqld--defaults-file.test
    modified:
      BUILD/build_mccge.sh
      CMakeLists.txt
      client/mysqlbinlog.cc
      client/mysqltest.cc
      cmd-line-utils/libedit/CMakeLists.txt
      config.h.cmake
      include/atomic/x86-gcc.h
      include/m_ctype.h
      include/my_global.h
      include/my_stacktrace.h
      libmysqld/CMakeLists.txt
      mysql-test/collections/default.experimental
      mysql-test/extra/binlog_tests/binlog.test
      mysql-test/extra/binlog_tests/binlog_insert_delayed.test
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
      mysql-test/extra/rpl_tests/rpl_change_master.test
      mysql-test/extra/rpl_tests/rpl_change_master_bind.inc
      mysql-test/extra/rpl_tests/rpl_conflicts.test
      mysql-test/extra/rpl_tests/rpl_flsh_tbls.test
      mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test
      mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test
      mysql-test/extra/rpl_tests/rpl_reset_slave.test
      mysql-test/extra/rpl_tests/rpl_start_stop_slave.test
      mysql-test/include/mtr_warnings.sql
      mysql-test/include/restart_mysqld.inc
      mysql-test/lib/mtr_cases.pm
      mysql-test/mysql-test-run.pl
      mysql-test/r/lock_multi.result
      mysql-test/r/mdl_sync.result
      mysql-test/r/merge.result
      mysql-test/r/mysql.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/r/mysqltest.result
      mysql-test/r/plugin_not_embedded.result
      mysql-test/r/show_check.result
      mysql-test/r/variables.result
      mysql-test/r/view.result
      mysql-test/suite/binlog/r/binlog_killed.result
      mysql-test/suite/binlog/r/binlog_old_versions.result
      mysql-test/suite/binlog/r/binlog_row_binlog.result
      mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result
      mysql-test/suite/binlog/r/binlog_stm_binlog.result
      mysql-test/suite/binlog/t/binlog_killed.test
      mysql-test/suite/binlog/t/binlog_max_extension.test
      mysql-test/suite/binlog/t/binlog_old_versions.test
      mysql-test/suite/perfschema/include/privilege.inc
      mysql-test/suite/perfschema/r/dml_cond_instances.result
      mysql-test/suite/perfschema/r/dml_ews_by_instance.result
      mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result
      mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result
      mysql-test/suite/perfschema/r/dml_file_instances.result
      mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result
      mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result
      mysql-test/suite/perfschema/r/dml_mutex_instances.result
      mysql-test/suite/perfschema/r/dml_rwlock_instances.result
      mysql-test/suite/perfschema/r/misc.result
      mysql-test/suite/perfschema/r/myisam_file_io.result
      mysql-test/suite/perfschema/r/privilege.result
      mysql-test/suite/perfschema/t/dml_cond_instances.test
      mysql-test/suite/perfschema/t/dml_ews_by_instance.test
      mysql-test/suite/perfschema/t/dml_ews_by_thread_by_event_name.test
      mysql-test/suite/perfschema/t/dml_ews_global_by_event_name.test
      mysql-test/suite/perfschema/t/dml_file_instances.test
      mysql-test/suite/perfschema/t/dml_file_summary_by_event_name.test
      mysql-test/suite/perfschema/t/dml_file_summary_by_instance.test
      mysql-test/suite/perfschema/t/dml_mutex_instances.test
      mysql-test/suite/perfschema/t/dml_rwlock_instances.test
      mysql-test/suite/perfschema/t/misc.test
      mysql-test/suite/perfschema/t/myisam_file_io.test
      mysql-test/suite/rpl/r/rpl_change_master.result
      mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result
      mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
      mysql-test/suite/rpl/r/rpl_rotate_logs.result
      mysql-test/suite/rpl/r/rpl_row_conflicts.result
      mysql-test/suite/rpl/r/rpl_server_uuid.result
      mysql-test/suite/rpl/r/rpl_slave_status.result
      mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/suite/rpl/t/rpl_change_master.test
      mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
      mysql-test/suite/rpl/t/rpl_known_bugs_detection.test
      mysql-test/suite/rpl/t/rpl_migration_crash_safe.test
      mysql-test/suite/rpl/t/rpl_rotate_logs.test
      mysql-test/suite/rpl/t/rpl_row_ignorable_event.test
      mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
      mysql-test/suite/rpl/t/rpl_server_uuid.test
      mysql-test/suite/rpl/t/rpl_slave_status.test
      mysql-test/suite/rpl/t/rpl_trigger.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test
      mysql-test/suite/sys_vars/t/all_vars.test
      mysql-test/t/mysql.test
      mysql-test/t/mysqlbinlog2.test
      mysql-test/t/mysqltest.test
      mysql-test/t/plugin_not_embedded.test
      mysql-test/t/server_uuid_embedded.test
      mysql-test/t/variables.test
      mysys/default.c
      mysys/mf_format.c
      mysys/stacktrace.c
      plugin/semisync/semisync_slave_plugin.cc
      sql/CMakeLists.txt
      sql/binlog.cc
      sql/binlog.h
      sql/event_data_objects.cc
      sql/event_data_objects.h
      sql/event_db_repository.cc
      sql/ha_partition.cc
      sql/item.cc
      sql/item_cmpfunc.cc
      sql/item_timefunc.h
      sql/log.cc
      sql/log_event.cc
      sql/log_event.h
      sql/mysqld.cc
      sql/mysqld.h
      sql/opt_range.cc
      sql/partition_info.cc
      sql/rpl_master.cc
      sql/rpl_mi.cc
      sql/rpl_mi.h
      sql/rpl_rli.cc
      sql/rpl_slave.cc
      sql/rpl_utility.cc
      sql/set_var.h
      sql/share/errmsg-utf8.txt
      sql/sp.cc
      sql/sp.h
      sql/sp_head.cc
      sql/sp_head.h
      sql/sql_acl.cc
      sql/sql_binlog.cc
      sql/sql_cache.cc
      sql/sql_cache.h
      sql/sql_class.h
      sql/sql_insert.cc
      sql/sql_plugin.cc
      sql/sql_plugin.h
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_show.cc
      sql/sql_table.cc
      sql/sql_trigger.cc
      sql/sql_trigger.h
      sql/sql_udf.cc
      sql/sql_view.cc
      sql/sys_vars.cc
      sql/sys_vars.h
      storage/perfschema/ha_perfschema.cc
      storage/perfschema/ha_perfschema.h
      storage/perfschema/pfs_engine_table.cc
      storage/perfschema/pfs_instr.cc
      storage/perfschema/pfs_instr_class.cc
      storage/perfschema/pfs_instr_class.h
      storage/perfschema/table_setup_actors.cc
      storage/perfschema/table_setup_consumers.cc
      storage/perfschema/table_setup_instruments.cc
      storage/perfschema/table_setup_timers.cc
      storage/perfschema/table_threads.cc
      strings/my_strchr.c
 3305 Tor Didriksen	2010-12-02
      Fix test case results

    modified:
      mysql-test/r/join_outer_jcl6.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
 3304 Tor Didriksen	2010-12-02 [merge]
      Automerge trunk-bugfixing => opt-backporting
         Failing test(s): 
         main.join_outer_jcl6
         main.myisam_mrr 
         main.myisam_mrr_all 
         main.myisam_mrr_cost 
         main.myisam_mrr_cost_all 
         main.myisam_mrr_cost_icp 
         main.myisam_mrr_icp

    modified:
      mysql-test/r/ctype_utf8.result
      mysql-test/r/explain.result
      mysql-test/r/fulltext.result
      mysql-test/r/func_gconcat.result
      mysql-test/r/func_math.result
      mysql-test/r/func_misc.result
      mysql-test/r/group_by.result
      mysql-test/r/join_outer.result
      mysql-test/r/myisam_mrr_none.result
      mysql-test/r/partition_innodb.result
      mysql-test/t/ctype_utf8.test
      mysql-test/t/explain.test
      mysql-test/t/fulltext.test
      mysql-test/t/func_gconcat.test
      mysql-test/t/func_math.test
      mysql-test/t/func_misc.test
      mysql-test/t/group_by.test
      mysql-test/t/join_outer.test
      mysql-test/t/partition_innodb.test
      mysys/my_symlink.c
      sql/ha_partition.cc
      sql/item_func.cc
      sql/item_func.h
      sql/item_strfunc.cc
      sql/item_subselect.cc
      sql/item_sum.cc
      sql/sql_select.cc
 3303 Tor Didriksen	2010-12-02 [merge]
      Automerge trunk-bugfixing => opt-backporting

    added:
      mysql-test/include/ctype_8bit.inc
    modified:
      client/mysql.cc
      mysql-test/r/ctype_cp1251.result
      mysql-test/r/mysql.result
      mysql-test/t/ctype_cp1251.test
      mysql-test/t/mysql.test
      sql/share/charsets/cp1251.xml
      strings/ctype-extra.c
 3302 Tor Didriksen	2010-12-02 [merge]
      Automerge trunk-bugfixing => opt-backporting

    modified:
      mysql-test/extra/rpl_tests/rpl_change_master_bind.inc
      mysql-test/r/ctype_utf8mb4_uca.result
      mysql-test/suite/rpl/r/rpl_change_master.result
      mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result
      mysql-test/t/ctype_utf8mb4_uca.test
      sql/rpl_mi.cc
 3301 Tor Didriksen	2010-12-02 [merge]
      Automerge trunk-bugfixing => opt-backporting

    added:
      mysql-test/include/ctype_czech.inc
      mysql-test/include/ctype_like_ignorable.inc
      mysql-test/r/ctype_like_range.result
      mysql-test/t/ctype_like_range.test
    modified:
      include/m_ctype.h
      mysql-test/r/ctype_uca.result
      mysql-test/r/ctype_utf16_uca.result
      mysql-test/r/ctype_utf32_uca.result
      mysql-test/r/func_time.result
      mysql-test/t/ctype_uca.test
      mysql-test/t/ctype_utf16_uca.test
      mysql-test/t/ctype_utf32_uca.test
      mysql-test/t/func_time.test
      sql/item_create.cc
      sql/item_strfunc.cc
      sql/item_strfunc.h
      sql/item_timefunc.cc
      strings/ctype-mb.c
      strings/ctype-uca.c
      strings/ctype-ucs2.c
 3300 Tor Didriksen	2010-12-02 [merge]
      Empty merge trunk-bugfixing => opt-backporting

 3299 Tor Didriksen	2010-12-02 [merge]
      Empty merge trunk-bugfixing => opt-backporting

 3298 Tor Didriksen	2010-12-02 [merge]
      NULL merge trunk-bugfixing => opt-backporting

 3297 Tor Didriksen	2010-12-02 [merge]
      Empty merge trunk-bugfixing => opt-backporting

 3296 Tor Didriksen	2010-12-02 [merge]
      Empty merge trunk-bugfixing => opt-backporting

 3295 Tor Didriksen	2010-12-02 [merge]
      NULL merge trunk-bugfixing => opt-backporting

 3294 Tor Didriksen	2010-12-02 [merge]
      Automerge trunk-bugfixing => opt-backporting

    removed:
      packaging/WiX/ca/CustomAction.rc
    added:
      mysql-test/extra/rpl_tests/rpl_change_master_bind.inc
    modified:
      cmake/dtrace.cmake
      mysql-test/extra/rpl_tests/rpl_change_master.test
      mysql-test/include/check_ipv6.inc
      mysql-test/r/variables.result
      mysql-test/suite/rpl/r/rpl_change_master.result
      mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/t/variables.test
      packaging/WiX/ca/CMakeLists.txt
      packaging/WiX/mysql_server.wxs.in
      sql/lex.h
      sql/rpl_mi.cc
      sql/rpl_mi.h
      sql/rpl_slave.cc
      sql/sql_lex.h
      sql/sql_yacc.yy
      strings/CHARSET_INFO.txt
 3293 Olav Sandstaa	2010-11-30
      WL#5692 "Enable Disk-Sweep Multi-Range Read optimizer feature".
            
      This patch contains the second part of this worklog. With this change
      the MySQL server will be built with support for the Multi-Range Read
      (MRR) feature. The default will be that cost-based MRR will be
      enabled.
      
      The following changes to MySQL are implemented:
            
      1. Enable disk-sweep Multi-Range Read for MyISAM and InnoDB
              
      With this feature enabled the optimizer will consider to use the
      disk-sweep multi-range read strategy when reading a range of
      records using a secondary index. The decision whether to use
      MRR or not is (by default) cost-based. The disk-sweep MRR strategy
      is implemented for MyISAM and InnoDB.
            
      The main change by enabling MRR should be improved performance for
      range queries that needs to access records from the base table using a
      secondary index when the base table requires disk-access. The user
      should be able to see if MRR has been used by looking in the "Extra"
      column of the EXPLAIN output. If this field contains the string "Using
      MRR" then MRR will be used.
            
      2. Enable the user to control the use of Multi-Range Read
            
      When MRR has been enabled the user will be able to control the use 
      of MRR by using two optimizer_switch configuration variables:
      
      * mrr: if this is on then MRR is available for use by the optimizer
        The default value is "on".
      
      * mrr_cost_based: This determines whether the use of MRR should be
        based on cost estimates done by the optimizer (value: on) 
        or if MRR should always be used (value: off). The default value
        is "on".
     @ mysql-test/r/index_merge_myisam.result
        Change in result file caused by changing the order for optimizer switch
        flags due to enabling Multi-range read (MRR).
     @ mysql-test/r/mysqld--help-notwin.result
        Change in result file caused by changing the order for optimizer switch
        flags due to enabling Multi-range read (MRR).
     @ mysql-test/r/mysqld--help-win.result
        Change in result file caused by changing the order for optimizer switch
        flags due to enabling Multi-range read (MRR).
     @ mysql-test/r/optimizer_switch.result
        Change in result file caused by changing the order for optimizer switch
        flags due to enabling Multi-range read (MRR).
     @ mysql-test/suite/sys_vars/r/optimizer_switch_basic.result
        Change in result file caused by changing the order for optimizer switch
        flags due to enabling Multi-range read (MRR).
     @ sql/sql_priv.h
        Enable cost-based Multi-Range Read by default. The
        OPTIMIZER_SWITCH_MRR and OPTIMIZER_SWITCH_MRR_COST_BASED 
        flags will be included in the OPTIMIZER_SWITCH_DEFAULT
        macro also for the case where OPTIMIZER_SWITCH_ALL is
        undefined.
     @ sql/sys_vars.cc
        Enable Multi-Range Read by changing optimizer_switch_names variable
        so that "mrr" and "mrr_cost_based" are included also when
        OPTIMIZER_SWITCH_ALL is not defined.

    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/sys_vars/r/optimizer_switch_basic.result
      sql/sql_priv.h
      sql/sys_vars.cc

Diff too large for email (18337 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-bugfixing branch (tor.didriksen:3293 to 3311) Tor Didriksen3 Dec