From: Christopher Powers Date: February 10 2012 9:27pm Subject: bzr push into mysql-trunk-wl5767 branch (chris.powers:3425 to 3426) WL#5767 List-Archive: http://lists.mysql.com/commits/142832 Message-Id: <201202102131.q1ALV9G8014244@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3426 Christopher Powers 2012-02-10 [merge] WL#5767 PERFORMANCE_SCHEMA STATEMENTS DIGEST Merge with mysql-trunk added: mysql-test/r/debug_sync2.result mysql-test/suite/innodb/r/innodb-index-debug.result mysql-test/suite/innodb/t/innodb-index-debug.test mysql-test/t/debug_sync2-master.opt mysql-test/t/debug_sync2.test modified: 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/mysql-test-run.pl mysql-test/r/events_restart.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/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/read_only.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_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/type_time.result mysql-test/suite/binlog/r/binlog_unsafe.result mysql-test/suite/binlog/t/binlog_unsafe.test mysql-test/suite/innodb/r/innodb_mysql.result mysql-test/suite/innodb/t/innodb-index.test mysql-test/suite/opt_trace/include/general.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/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/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/rpl/r/rpl_auto_increment_11932.result mysql-test/suite/rpl/r/rpl_corruption.result mysql-test/suite/rpl/r/rpl_insert_id_pk.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_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_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/t/innodb_buffer_pool_filename_basic.test mysql-test/t/events_restart.test mysql-test/t/heap.test mysql-test/t/innodb_mysql_sync.test mysql-test/t/multi_update.test mysql-test/t/ps.test mysql-test/t/read_only.test mysql-test/t/type_time.test sql/debug_sync.cc sql/events.cc sql/item.h sql/item_cmpfunc.cc sql/item_cmpfunc.h sql/item_subselect.cc sql/item_subselect.h sql/opt_range.cc sql/share/errmsg-utf8.txt sql/sql_base.cc sql/sql_class.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_optimizer.cc sql/sql_optimizer.h sql/sql_resolver.cc sql/sql_select.cc sql/sql_show.cc sql/sql_table.cc sql/sql_tmp_table.cc sql/sys_vars.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/row/row0merge.cc storage/innobase/trx/trx0trx.cc unittest/gunit/opt_range-t.cc 3425 Christopher Powers 2012-02-10 [merge] local merge added: mysql-test/include/digest_cleanup.inc mysql-test/include/digest_execution.inc mysql-test/include/digest_setup.inc mysql-test/suite/perfschema/r/statement_digest_consumers.result mysql-test/suite/perfschema/r/statement_digest_consumers2.result mysql-test/suite/perfschema/t/statement_digest_consumers-master.opt mysql-test/suite/perfschema/t/statement_digest_consumers.test mysql-test/suite/perfschema/t/statement_digest_consumers2-master.opt mysql-test/suite/perfschema/t/statement_digest_consumers2.test modified: include/mysql/psi/psi.h include/mysql/psi/psi_abi_v0.h.pp include/mysql/psi/psi_abi_v1.h.pp include/mysql/psi/psi_abi_v2.h.pp mysql-test/suite/perfschema/r/start_server_no_digests.result mysql-test/suite/perfschema/r/statements_digest.result mysql-test/suite/perfschema/t/start_server_no_digests.test mysql-test/suite/perfschema/t/statements_digest.test mysys/psi_noop.c sql/sql_lex.cc storage/perfschema/pfs.cc storage/perfschema/pfs_digest.cc storage/perfschema/pfs_digest.h storage/perfschema/pfs_events_statements.h storage/perfschema/table_events_statements.cc Diff too large for email (12035 lines, the limit is 10000). No bundle (reason: useless for push emails).