From: Mayank Prasad Date: December 19 2011 7:24am Subject: bzr push into mysql-trunk-wl5767 branch (mayank.prasad:3401 to 3402) WL#5767 List-Archive: http://lists.mysql.com/commits/142171 Message-Id: <201112190724.pBJ7OVL1012237@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3402 Mayank Prasad 2011-12-19 [merge] WL#5767: statement digest, performance schema. details: -merge frm latest trunk added: mysql-test/suite/perfschema/r/start_server_disable_idle.result mysql-test/suite/perfschema/r/start_server_disable_stages.result mysql-test/suite/perfschema/r/start_server_disable_statements.result mysql-test/suite/perfschema/r/start_server_disable_waits.result mysql-test/suite/perfschema/t/start_server_disable_idle-master.opt mysql-test/suite/perfschema/t/start_server_disable_idle.test mysql-test/suite/perfschema/t/start_server_disable_stages-master.opt mysql-test/suite/perfschema/t/start_server_disable_stages.test mysql-test/suite/perfschema/t/start_server_disable_statements-master.opt mysql-test/suite/perfschema/t/start_server_disable_statements.test mysql-test/suite/perfschema/t/start_server_disable_waits-master.opt mysql-test/suite/perfschema/t/start_server_disable_waits.test sql/sql_executor.cc sql/sql_executor.h sql/sql_join_buffer.h sql/sql_optimizer.cc sql/sql_optimizer.h sql/sql_planner.cc sql/sql_planner.h sql/sql_resolver.cc sql/sql_resolver.h sql/sql_tmp_table.cc sql/sql_tmp_table.h renamed: sql/sql_join_cache.cc => sql/sql_join_buffer.cc modified: client/mysqlbinlog.cc cmake/install_macros.cmake mysql-test/collections/default.push mysql-test/include/range.inc mysql-test/include/select.inc mysql-test/include/subquery_sj.inc mysql-test/r/func_in_all.result mysql-test/r/innodb_explain_non_select_all.result mysql-test/r/innodb_explain_non_select_none.result mysql-test/r/innodb_mrr_all.result mysql-test/r/innodb_mrr_cost_all.result mysql-test/r/multi_update.result mysql-test/r/myisam_mrr_all.result mysql-test/r/myisam_mrr_cost_all.result mysql-test/r/mysqlbinlog.result mysql-test/r/mysqlbinlog2.result mysql-test/r/mysqld--help-win.result mysql-test/r/partition_explicit_prune.result mysql-test/r/partition_hash.result mysql-test/r/partition_mgm.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/select_all.result mysql-test/r/select_icp_mrr.result mysql-test/r/select_icp_mrr_bka.result mysql-test/r/select_icp_mrr_bka_nixbnl.result mysql-test/r/select_none.result mysql-test/r/select_none_bka.result mysql-test/r/select_none_bka_nixbnl.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_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_temporal_fractional.result mysql-test/r/update.result mysql-test/suite/binlog/r/binlog_hexdump.result mysql-test/suite/binlog/r/binlog_mysqlbinlog_filter.result mysql-test/suite/binlog/t/binlog_index.test mysql-test/suite/binlog/t/binlog_mysqlbinlog_filter.test mysql-test/suite/innodb/r/innodb.result mysql-test/suite/innodb/t/innodb.test mysql-test/suite/innodb/t/innodb_bug34053.test mysql-test/suite/innodb_fts/r/innodb_fts_misc_1.result mysql-test/suite/innodb_fts/t/innodb_fts_misc_1.test mysql-test/suite/rpl/r/rpl_row_img_sanity.result mysql-test/suite/rpl/t/rpl_binlog_errors.test mysql-test/suite/rpl/t/rpl_empty_master_host.test mysql-test/suite/rpl/t/rpl_row_img_sanity.test mysql-test/suite/rpl/t/rpl_server_id_ignore.test mysql-test/t/multi_update.test mysql-test/t/partition_hash.test mysql-test/t/partition_mgm.test mysql-test/t/sp.test mysql-test/t/type_temporal_fractional.test mysql-test/t/update.test scripts/mysql_system_tables.sql sql/CMakeLists.txt sql/field.cc sql/ha_partition.cc sql/ha_partition.h sql/item.cc sql/item_cmpfunc.cc sql/item_strfunc.cc sql/item_subselect.cc sql/item_sum.cc sql/item_timefunc.cc sql/mysqld.cc sql/nt_servc.cc sql/nt_servc.h sql/opt_explain.cc sql/opt_explain.h sql/opt_range.cc sql/opt_range.h sql/records.cc sql/records.h sql/rpl_utility.cc sql/sp_rcontext.cc sql/sql_base.cc sql/sql_class.cc sql/sql_class.h sql/sql_cursor.cc sql/sql_delete.cc sql/sql_derived.cc sql/sql_insert.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_partition.cc sql/sql_select.cc sql/sql_select.h sql/sql_show.cc sql/sql_table.cc sql/sql_test.cc sql/sql_union.cc sql/sql_update.cc sql/sql_yacc.yy storage/innobase/buf/buf0buddy.cc storage/innobase/buf/buf0buf.cc storage/innobase/buf/buf0flu.cc storage/innobase/buf/buf0lru.cc storage/innobase/dict/dict0dict.cc storage/innobase/dict/dict0mem.cc storage/innobase/dict/dict0stats.cc storage/innobase/dyn/dyn0dyn.cc storage/innobase/fil/fil0fil.cc storage/innobase/fts/fts0fts.cc storage/innobase/fts/fts0opt.cc storage/innobase/handler/ha_innodb.cc storage/innobase/handler/handler0alter.cc storage/innobase/include/dict0mem.h storage/innobase/include/fts0fts.h storage/innobase/include/lock0lock.h storage/innobase/include/lock0priv.h storage/innobase/include/lock0types.h storage/innobase/include/mem0mem.ic storage/innobase/include/page0page.h storage/innobase/include/sync0sync.h storage/innobase/include/trx0roll.h storage/innobase/include/trx0trx.h storage/innobase/include/usr0sess.h storage/innobase/include/ut0lst.h storage/innobase/lock/lock0iter.cc storage/innobase/lock/lock0lock.cc storage/innobase/log/log0log.cc storage/innobase/log/log0recv.cc storage/innobase/mem/mem0mem.cc storage/innobase/mem/mem0pool.cc storage/innobase/os/os0sync.cc storage/innobase/page/page0page.cc storage/innobase/pars/pars0opt.cc storage/innobase/pars/pars0pars.cc storage/innobase/pars/pars0sym.cc storage/innobase/que/que0que.cc storage/innobase/read/read0read.cc storage/innobase/row/row0ftsort.cc storage/innobase/row/row0ins.cc storage/innobase/row/row0merge.cc storage/innobase/row/row0mysql.cc storage/innobase/srv/srv0mon.cc storage/innobase/srv/srv0srv.cc storage/innobase/sync/sync0rw.cc storage/innobase/sync/sync0sync.cc storage/innobase/trx/trx0roll.cc storage/innobase/trx/trx0rseg.cc storage/innobase/trx/trx0sys.cc storage/innobase/trx/trx0trx.cc storage/innobase/trx/trx0undo.cc storage/innobase/usr/usr0sess.cc storage/innobase/ut/ut0mem.cc storage/perfschema/pfs.cc sql/sql_join_buffer.cc 3401 Mayank Prasad 2011-12-12 [merge] WL#5767 : statement digest, Performance Schema Details: - Merge from mysql-trunk added: mysql-test/suite/binlog/r/binlog_mysqlbinlog_filter.result mysql-test/suite/binlog/t/binlog_mysqlbinlog_filter.test mysql-test/suite/innodb/r/innodb_bug12429573.result mysql-test/suite/innodb/r/innodb_bug60229.result mysql-test/suite/innodb/t/innodb_bug12429573.test mysql-test/suite/innodb/t/innodb_bug60229-master.opt mysql-test/suite/innodb/t/innodb_bug60229.test modified: client/mysqlbinlog.cc include/my_sys.h libmysql/libmysql.c mysql-test/include/show_events.inc mysql-test/mysql-test-run.pl mysql-test/r/archive.result mysql-test/r/csv.result mysql-test/r/delayed.result mysql-test/r/gis.result mysql-test/r/lowercase_table2.result mysql-test/r/multi_update.result mysql-test/r/myisam-system.result mysql-test/r/myisampack.result mysql-test/r/partition_open_files_limit.result mysql-test/r/ps_1general.result mysql-test/r/sp.result mysql-test/r/symlink.result mysql-test/r/trigger.result mysql-test/r/view.result mysql-test/suite/binlog/r/binlog_index.result mysql-test/suite/federated/federated_bug_35333.result mysql-test/suite/funcs_1/r/is_columns_mysql.result mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result mysql-test/suite/innodb/r/innodb-index.result mysql-test/suite/innodb/r/innodb.result mysql-test/suite/innodb/r/innodb_16k.result mysql-test/suite/innodb/r/innodb_4k.result mysql-test/suite/innodb/r/innodb_8k.result mysql-test/suite/innodb/r/innodb_bug21704.result mysql-test/suite/innodb/r/innodb_misc1.result mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result mysql-test/suite/innodb/t/innodb_16k.test mysql-test/suite/innodb/t/innodb_4k.test mysql-test/suite/innodb/t/innodb_8k.test mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test mysql-test/suite/parts/r/partition_debug.result mysql-test/suite/parts/r/partition_debug_innodb.result mysql-test/suite/perfschema/r/server_init.result mysql-test/suite/perfschema/t/server_init.test mysql-test/suite/rpl/r/rpl_EE_err.result mysql-test/suite/rpl/r/rpl_binlog_errors.result mysql-test/t/csv.test mysql-test/t/delayed.test mysql-test/t/disabled.def mysql-test/t/gis.test mysql-test/t/multi_update.test mysql-test/t/mysql_embedded.test mysql-test/t/mysqlcheck.test mysql-test/t/sp.test mysql-test/t/view.test mysql-test/valgrind.supp mysys/errors.c mysys/mf_iocache.c mysys/my_chsize.c mysys/my_copy.c mysys/my_delete.c mysys/my_error.c mysys/my_fopen.c mysys/my_fstream.c mysys/my_getwd.c mysys/my_lib.c mysys/my_lock.c mysys/my_mkdir.c mysys/my_open.c mysys/my_pread.c mysys/my_read.c mysys/my_redel.c mysys/my_rename.c mysys/my_seek.c mysys/my_symlink.c mysys/my_symlink2.c mysys/my_sync.c mysys/my_write.c scripts/mysql_system_tables.sql sql/binlog.cc sql/handler.cc sql/item.cc sql/lock.cc sql/log.cc sql/mysqld.cc sql/mysqld.h sql/share/errmsg-utf8.txt sql/sp_head.cc sql/sql_class.cc sql/sql_class.h sql/sql_db.cc sql/sql_parse.cc sql/sql_partition_admin.cc sql/sql_prepare.cc sql/sql_rename.cc sql/sql_show.cc sql/sql_table.cc sql/sql_udf.cc sql/sql_update.cc sql/sql_view.cc sql/table.cc storage/innobase/dict/dict0dict.cc storage/innobase/dict/dict0stats.cc storage/innobase/fil/fil0fil.cc storage/innobase/handler/ha_innodb.cc storage/innobase/handler/ha_innodb.h storage/innobase/handler/handler0alter.cc storage/innobase/include/fil0fil.h storage/innobase/include/fsp0fsp.h storage/myisam/ha_myisam.cc unittest/gunit/segfault-t.cc Diff too large for email (64878 lines, the limit is 10000). No bundle (reason: useless for push emails).