From: Marc Alff Date: March 16 2012 10:55am Subject: bzr push into mysql-trunk-pfs-tuning branch (marc.alff:3471 to 3475) List-Archive: http://lists.mysql.com/commits/143229 Message-Id: <201203161055.q2GAtR9Y023442@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3475 Marc Alff 2012-03-16 Code cleanup modified: storage/perfschema/pfs_instr.cc storage/perfschema/pfs_instr_class.h storage/perfschema/pfs_visitor.cc storage/perfschema/table_events_waits.cc storage/perfschema/table_os_global_by_type.cc storage/perfschema/table_tiws_by_index_usage.cc 3474 Marc Alff 2012-03-16 Missing performance schema instrumentation on some innodb rw locks. Prototyped fix modified: storage/innobase/include/mtr0mtr.ic storage/innobase/include/sync0rw.h 3473 Marc Alff 2012-03-16 [merge] Merge mysql-trunk --> mysql-trunk-pfs-tuning modified: mysql-test/extra/rpl_tests/rpl_loaddata.test mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test mysql-test/suite/innodb/t/innodb_bug11766634.test mysql-test/suite/rpl/r/rpl_loaddata.result mysql-test/suite/rpl/r/rpl_stm_EE_err2.result mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result storage/innobase/fil/fil0fil.cc storage/innobase/handler/ha_innodb.cc storage/innobase/ibuf/ibuf0ibuf.cc storage/innobase/include/fil0fil.h storage/innobase/include/sync0rw.ic storage/innobase/lock/lock0lock.cc unittest/mysys/my_vsnprintf-t.c 3472 Marc Alff 2012-03-15 [merge] Merge mysql-trunk --> mysql-trunk-pfs-tuning added: mysql-test/r/ds_mrr-big.result mysql-test/t/ds_mrr-big.test modified: include/mysql_com.h mysql-test/include/mrr_tests.inc mysql-test/include/subquery.inc mysql-test/include/subquery_sj.inc mysql-test/r/cast.result mysql-test/r/disabled_replication.result mysql-test/r/explain.result mysql-test/r/explain_json_all.result mysql-test/r/explain_json_none.result mysql-test/r/filesort_debug.result mysql-test/r/get_diagnostics.result mysql-test/r/innodb_explain_json_non_select_all.result mysql-test/r/innodb_explain_json_non_select_none.result mysql-test/r/innodb_explain_non_select_all.result mysql-test/r/innodb_explain_non_select_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/myisam_explain_json_non_select_all.result mysql-test/r/myisam_explain_json_non_select_none.result mysql-test/r/myisam_explain_non_select_all.result mysql-test/r/myisam_explain_non_select_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/mysqlcheck.result mysql-test/r/packet.result mysql-test/r/partition_error.result mysql-test/r/partition_exchange.result mysql-test/r/partition_innodb.result mysql-test/r/partition_pruning.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/read_only_innodb.result mysql-test/r/select_all.result mysql-test/r/select_all_bka.result mysql-test/r/select_all_bka_nixbnl.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/shm.result mysql-test/r/sp-destruct.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_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_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_time.result mysql-test/r/variables-notembedded.result mysql-test/r/variables.result mysql-test/r/xa.result mysql-test/suite/funcs_1/r/is_tables_mysql.result mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result mysql-test/suite/innodb/r/innodb-autoinc.result mysql-test/suite/innodb/r/innodb-system-table-view.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_bug60049.result mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result mysql-test/suite/innodb/t/innodb-autoinc.test mysql-test/suite/innodb/t/innodb-system-table-view.test mysql-test/suite/perfschema/r/pfs_upgrade.result mysql-test/suite/perfschema/t/no_threads-master.opt mysql-test/suite/rpl/r/rpl_alter_repository.result mysql-test/suite/rpl/r/rpl_heartbeat.result mysql-test/suite/rpl/r/rpl_heartbeat_basic.result mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_mixed_mts_crash_safe.result mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe.result mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe_checksum.result mysql-test/suite/rpl/r/rpl_packet.result mysql-test/suite/rpl/r/rpl_parallel_start_stop.result mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_row_crash_safe.result mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result mysql-test/suite/rpl/r/rpl_stm_mts_crash_safe.result mysql-test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result mysql-test/suite/rpl/t/rpl_alter_repository.test mysql-test/suite/rpl/t/rpl_parallel_start_stop.test mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result mysql-test/suite/sys_vars/r/max_allowed_packet_func.result mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result mysql-test/t/bootstrap-master.opt mysql-test/t/disabled_replication.test mysql-test/t/filesort_debug.test mysql-test/t/innodb_ignore_builtin-master.opt mysql-test/t/myisam-blob-master.opt mysql-test/t/mysql_embedded-master.opt mysql-test/t/partition_error.test mysql-test/t/partition_innodb.test mysql-test/t/warnings-master.opt mysql-test/t/xa.test scripts/mysql_system_tables.sql sql/filesort.cc sql/ha_partition.cc sql/ha_partition.h sql/handler.cc sql/handler.h sql/item.cc sql/item.h sql/item_cmpfunc.cc sql/item_func.cc sql/item_geofunc.cc sql/opt_range.cc sql/share/errmsg-utf8.txt sql/sql_optimizer.cc sql/sql_optimizer.h sql/sql_table.cc sql/sql_table.h sql/sql_yacc.yy sql/transaction.cc sql/unireg.cc storage/innobase/handler/ha_innodb.cc storage/myisam/ha_myisam.cc unittest/mysys/my_vsnprintf-t.c 3471 Marc Alff 2012-03-14 [merge] Merge mysql-trunk --> mysql-trunk-pfs-tuning added: mysql-test/r/disabled_replication.result mysql-test/suite/rpl/r/rpl_stm_relay_ign_space.result mysql-test/suite/rpl/t/rpl_stm_relay_ign_space-slave.opt mysql-test/suite/rpl/t/rpl_stm_relay_ign_space.test mysql-test/t/disabled_replication-master.opt mysql-test/t/disabled_replication.test modified: libmysqld/lib_sql.cc mysql-test/include/check-testcase.test mysql-test/suite/innodb/r/innodb_bug-13628249.result mysql-test/suite/innodb/t/innodb_bug-13628249.test mysql-test/suite/innodb_fts/r/innodb_fts_misc.result mysql-test/suite/innodb_fts/t/innodb_fts_misc.test mysql-test/suite/rpl/t/rpl_binlog_errors.test sql/binlog.cc sql/item.cc sql/item_func.cc sql/item_xmlfunc.cc sql/mysqld.cc sql/opt_explain_json.cc sql/protocol.cc sql/rpl_master.cc sql/rpl_master.h sql/rpl_rli.cc sql/rpl_rli.h sql/rpl_slave.cc sql/rpl_slave.h sql/share/errmsg-utf8.txt sql/sp.cc sql/sp_head.cc sql/sp_head.h sql/sp_pcontext.h sql/sp_rcontext.cc sql/sp_rcontext.h sql/sql_acl.cc sql/sql_class.cc sql/sql_class.h sql/sql_error.cc sql/sql_error.h sql/sql_get_diagnostics.cc sql/sql_insert.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_load.cc sql/sql_parse.cc sql/sql_prepare.cc sql/sql_reload.cc sql/sql_show.cc sql/sql_signal.cc sql/sql_trigger.cc sql/sql_trigger.h sql/sql_view.cc sql/sql_yacc.yy sql/sys_vars.cc storage/innobase/fts/fts0fts.cc storage/innobase/include/trx0purge.h storage/innobase/include/ut0vec.ic storage/innobase/lock/lock0lock.cc storage/innobase/srv/srv0srv.cc storage/innobase/srv/srv0start.cc unittest/mysys/my_vsnprintf-t.c Diff too large for email (10944 lines, the limit is 10000). No bundle (reason: useless for push emails).