List:Commits« Previous MessageNext Message »
From:Jon Olav Hauglid Date:November 1 2011 9:20am
Subject:bzr push into mysql-trunk-wl5534 branch (jon.hauglid:3417 to 3418)
View as plain text  
 3418 Jon Olav Hauglid	2011-11-01 [merge]
      Merge from mysql-trunk to mysql-trunk-wl5534.
      No conflicts.

    removed:
      mysql-test/suite/rpl/r/rpl_mixed_crash_safe.result.THIS
      mysql-test/suite/rpl/t/rpl_mixed_crash_safe.test.THIS
      storage/perfschema/table_file_summary.cc
      storage/perfschema/table_file_summary.h
    added:
      mysql-test/suite/rpl/r/rpl_rotate_purge_deadlock.result
      mysql-test/suite/rpl/t/rpl_rotate_purge_deadlock-master.opt
      mysql-test/suite/rpl/t/rpl_rotate_purge_deadlock.test
      storage/perfschema/table_file_summary_by_event_name.cc
      storage/perfschema/table_file_summary_by_event_name.h
      storage/perfschema/table_file_summary_by_instance.cc
      storage/perfschema/table_file_summary_by_instance.h
    modified:
      cmd-line-utils/libedit/README
      cmd-line-utils/libedit/chared.c
      mysql-test/extra/rpl_tests/rpl_parallel_load.test
      mysql-test/include/subquery_mat.inc
      mysql-test/include/subquery_sj.inc
      mysql-test/r/archive.result
      mysql-test/r/compare.result
      mysql-test/r/derived.result
      mysql-test/r/func_rollback.result
      mysql-test/r/index_merge_innodb.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/r/optimizer_switch.result
      mysql-test/r/plugin.result
      mysql-test/r/signal.result
      mysql-test/r/sp-error.result
      mysql-test/r/sp.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_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/user_var.result
      mysql-test/r/view_grant.result
      mysql-test/suite/funcs_1/r/storedproc.result
      mysql-test/suite/opt_trace/r/bugs_no_prot_all.result
      mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result
      mysql-test/suite/opt_trace/r/general_no_prot_all.result
      mysql-test/suite/opt_trace/r/general_ps_prot_all.result
      mysql-test/suite/opt_trace/r/range_no_prot.result
      mysql-test/suite/opt_trace/r/range_ps_prot.result
      mysql-test/suite/perfschema/r/func_file_io.result
      mysql-test/suite/perfschema/r/pfs_upgrade.result
      mysql-test/suite/perfschema/r/relaylog.result
      mysql-test/suite/perfschema/r/schema.result
      mysql-test/suite/perfschema/r/start_server_nothing.result
      mysql-test/suite/perfschema/r/table_schema.result
      mysql-test/suite/rpl/r/rpl_alter_repository.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/t/rpl_alter_repository.test
      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/sort_buffer_size_basic_32.result*
      mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result
      mysql-test/t/archive.test
      mysql-test/t/compare.test
      mysql-test/t/derived.test
      mysql-test/t/index_merge_innodb.test
      mysql-test/t/plugin.test
      mysql-test/t/signal.test
      mysql-test/t/sp-error.test
      mysql-test/t/user_var.test
      scripts/mysql_system_tables.sql
      sql/binlog.cc
      sql/binlog.h
      sql/event_db_repository.cc
      sql/events.cc
      sql/item_cmpfunc.cc
      sql/log.cc
      sql/log.h
      sql/opt_range.cc
      sql/records.cc
      sql/records.h
      sql/rpl_master.cc
      sql/rpl_slave.cc
      sql/sp_head.cc
      sql/sp_rcontext.cc
      sql/sql_acl.cc
      sql/sql_base.cc
      sql/sql_class.h
      sql/sql_const.h
      sql/sql_delete.cc
      sql/sql_help.cc
      sql/sql_join_cache.cc
      sql/sql_parse.cc
      sql/sql_plugin.cc
      sql/sql_reload.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_servers.cc
      sql/sql_table.cc
      sql/sql_udf.cc
      sql/sql_update.cc
      sql/sys_vars.cc
      storage/archive/ha_archive.cc
      storage/innobase/buf/buf0buf.c
      storage/innobase/dict/dict0dict.c
      storage/innobase/fil/fil0fil.c
      storage/innobase/fsp/fsp0fsp.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/buf0buf.h
      storage/innobase/include/fil0fil.h
      storage/innobase/include/fsp0fsp.h
      storage/innobase/include/sync0rw.ic
      storage/innobase/lock/lock0lock.c
      storage/innobase/row/row0mysql.c
      storage/innobase/row/row0umod.c
      storage/innobase/srv/srv0start.c
      storage/perfschema/CMakeLists.txt
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_engine_table.cc
      storage/perfschema/pfs_events.h
      storage/perfschema/pfs_instr.cc
      storage/perfschema/pfs_instr.h
      storage/perfschema/pfs_stat.h
      storage/perfschema/pfs_visitor.cc
      storage/perfschema/pfs_visitor.h
      storage/perfschema/table_events_stages.cc
      storage/perfschema/table_events_stages.h
      storage/perfschema/table_events_statements.cc
      storage/perfschema/table_events_statements.h
      storage/perfschema/table_events_waits.cc
      storage/perfschema/table_events_waits.h
      storage/perfschema/table_helper.h
      storage/perfschema/table_socket_summary_by_instance.cc
 3417 Jon Olav Hauglid	2011-10-31
      WL#5534 Online ALTER, Phase 1.
        
      Patch #43: Review fixes, part 1.
      - Renamed handler_add_index to inplace_alter_handler_ctx.
      - Added comment about why IX locks are not present in
        per-object metadata lock compatibility matrix.
      - MDL_SHARED_UPGRADABLE locks don't need notifications.

    modified:
      sql/ha_partition.cc
      sql/handler.h
      sql/mdl.cc
      storage/innobase/handler/ha_innodb.h
      storage/innobase/handler/handler0alter.cc

Diff too large for email (14509 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-wl5534 branch (jon.hauglid:3417 to 3418) Jon Olav Hauglid1 Nov