From: Christopher Powers Date: November 9 2011 1:40am Subject: bzr push into mysql-trunk-wl5461 branch (chris.powers:3425 to 3426) WL#5461 List-Archive: http://lists.mysql.com/commits/141883 Message-Id: <201111090140.pA91e4vt025451@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3426 Christopher Powers 2011-11-08 [merge] WL#5461 PERFORMANCE_SCHEMA MY.CNF Default Setup - Merged with mysql-trunk - Updated implementation removed: BUILD/compile-alpha-debug BUILD/compile-darwin-mwcc BUILD/compile-irix-mips64-mipspro BUILD/compile-pentium-icc BUILD/compile-pentium-icc-valgrind-max BUILD/compile-pentium-icc-yassl BUILD/compile-pentium-pgcc mysql-test/suite/binlog/r/binlog_truncate_innodb.result mysql-test/suite/binlog/t/binlog_truncate_innodb.test mysys/my_new.cc added: include/mysql/psi/psi_abi_v0.h include/mysql/psi/psi_abi_v0.h.pp mysys/my_isnan.c unittest/gunit/filesort_buffer-t.cc unittest/gunit/stdcxx-t.cc renamed: mysys/psi_noop.cc => mysys/psi_noop.c sql/udf_example.c => sql/udf_example.cc modified: BUILD/SETUP.sh BUILD/build_mccge.sh BUILD/compile-dist BUILD/compile-solaris-amd64 BUILD/compile-solaris-amd64-forte BUILD/compile-solaris-amd64-forte-debug BUILD/compile-solaris-sparc BUILD/compile-solaris-sparc-debug BUILD/compile-solaris-sparc-forte BUILD/compile-solaris-sparc-purify VERSION client/CMakeLists.txt client/mysql.cc client/mysql_upgrade.c client/mysqlbinlog.cc client/mysqldump.c client/mysqltest.cc client/sql_string.cc cmake/abi_check.cmake cmake/build_configurations/mysql_release.cmake cmake/configure.pl cmake/info_macros.cmake.in cmake/os/Windows.cmake cmake/readline.cmake config.h.cmake configure.cmake dbug/dbug.c include/m_string.h include/my_global.h include/my_pthread.h include/mysql.h include/mysql/psi/mysql_socket.h include/mysql/psi/mysql_thread.h include/mysql/psi/psi.h include/mysql/psi/psi_abi_v1.h include/mysql/psi/psi_abi_v1.h.pp include/mysql/psi/psi_abi_v2.h.pp include/mysql_com.h include/waiting_threads.h libmysql/libmysql.c libmysqld/lib_sql.cc mysql-test/collections/default.experimental mysql-test/include/default_mysqld.cnf mysql-test/include/index_merge1.inc mysql-test/include/index_merge2.inc mysql-test/include/index_merge_ror.inc mysql-test/include/join_cache.inc mysql-test/mysql-test-run.pl mysql-test/r/case.result mysql-test/r/filesort_debug.result mysql-test/r/index_merge_innodb.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/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/udf.result mysql-test/suite/binlog/t/disabled.def mysql-test/suite/funcs_1/t/storedproc.test mysql-test/suite/opt_trace/include/general.inc mysql-test/suite/opt_trace/include/general2.inc mysql-test/suite/opt_trace/include/subquery.inc mysql-test/suite/opt_trace/r/filesort_pq.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_none.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/perfschema/r/nesting.result mysql-test/suite/perfschema/t/nesting.test mysql-test/suite/perfschema/t/socket_instances_func.test mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test mysql-test/suite/rpl/t/rpl_temporary.test mysql-test/t/case.test mysql-test/t/csv.test mysql-test/t/disabled.def mysql-test/t/filesort_debug.test mysql-test/t/index_merge_innodb.test mysql-test/t/information_schema_parameters.test mysql-test/t/information_schema_routines.test mysql-test/t/lock.test mysql-test/t/mysql_plugin.test mysql-test/t/mysqlbinlog2.test mysql-test/t/ps.test mysql-test/t/ps_ddl.test mysql-test/t/sp-error.test mysql-test/t/sp.test mysql-test/t/trigger.test mysql-test/t/udf.test mysql-test/t/view_grant.test mysql-test/valgrind.supp mysys/CMakeLists.txt mysys/array.c mysys/default.c mysys/lf_alloc-pin.c mysys/lf_dynarray.c mysys/mf_format.c mysys/mf_iocache.c mysys/my_alloc.c mysys/my_bitmap.c mysys/my_compare.c mysys/my_compress.c mysys/my_file.c mysys/stacktrace.c mysys/waiting_threads.c scripts/mysql_config.pl.in scripts/mysql_config.sh sql-common/client.c sql-common/client_plugin.c sql-common/my_time.c sql/CMakeLists.txt sql/binlog.cc sql/debug_sync.cc sql/field.cc sql/field.h sql/field_conv.cc sql/filesort.cc sql/filesort_utils.cc sql/filesort_utils.h sql/ha_partition.cc sql/handler.cc sql/handler.h sql/item.cc sql/item_buff.cc sql/item_cmpfunc.cc sql/item_func.cc sql/item_func.h sql/item_strfunc.cc sql/item_strfunc.h sql/item_sum.cc sql/item_timefunc.cc sql/item_timefunc.h sql/key.cc sql/log.cc sql/log_event.cc sql/log_event.h sql/log_event_old.cc sql/mdl.cc sql/mdl.h sql/mysqld.cc sql/net_serv.cc sql/opt_range.cc sql/opt_range.h sql/opt_trace.cc sql/opt_trace.h sql/protocol.cc sql/rpl_mi.cc sql/rpl_record.cc sql/rpl_rli.cc sql/rpl_slave.cc sql/rpl_utility.cc sql/rpl_utility.h sql/set_var.cc sql/set_var.h sql/sp_head.cc sql/spatial.h sql/sql_acl.cc sql/sql_analyse.cc sql/sql_cache.cc sql/sql_class.cc sql/sql_class.h sql/sql_client.cc sql/sql_connect.cc sql/sql_const.h sql/sql_error.cc sql/sql_join_cache.cc sql/sql_load.cc sql/sql_parse.cc sql/sql_partition.cc sql/sql_plugin.cc sql/sql_plugin.h sql/sql_prepare.cc sql/sql_profile.cc sql/sql_select.cc sql/sql_select.h sql/sql_show.cc sql/sql_string.cc sql/sql_table.cc sql/sql_table.h sql/sql_yacc.yy sql/sys_vars.cc sql/table.h sql/thr_malloc.cc sql/tztime.cc sql/udf_example.def sql/unireg.cc storage/csv/ha_tina.cc storage/federated/ha_federated.cc storage/heap/hp_create.c storage/heap/hp_static.c storage/heap/hp_test2.c storage/innobase/btr/btr0pcur.c storage/innobase/handler/ha_innodb.cc storage/innobase/ibuf/ibuf0ibuf.c storage/innobase/include/btr0pcur.h storage/innobase/include/btr0pcur.ic storage/innobase/sync/sync0rw.c storage/myisam/ha_myisam.cc storage/myisam/mi_cache.c storage/myisam/mi_check.c storage/myisam/mi_create.c storage/myisam/mi_dynrec.c storage/myisam/mi_extra.c storage/myisam/mi_open.c storage/myisam/mi_packrec.c storage/myisam/mi_static.c storage/myisam/myisamlog.c storage/myisam/myisampack.c storage/myisam/rt_mbr.c storage/myisam/sort.c storage/myisammrg/ha_myisammrg.cc storage/perfschema/pfs_instr_class.cc storage/perfschema/pfs_instr_class.h storage/perfschema/pfs_server.cc storage/perfschema/pfs_server.h strings/ctype-big5.c strings/ctype-bin.c strings/ctype-gbk.c strings/ctype-mb.c strings/ctype-simple.c strings/ctype-tis620.c strings/ctype-uca.c strings/ctype-ucs2.c strings/ctype-utf8.c strings/ctype.c strings/decimal.c strings/dtoa.c strings/my_vsnprintf.c support-files/mysql.spec.sh tests/mysql_client_test.c unittest/gunit/CMakeLists.txt unittest/gunit/gunit_test_main.cc unittest/gunit/item-t.cc unittest/mysys/lf-t.c unittest/mysys/my_atomic-t.c unittest/mysys/thr_template.c unittest/mysys/waiting_threads-t.c vio/viosocket.c win/create_def_file.js mysys/psi_noop.c sql/udf_example.cc 3425 Christopher Powers 2011-11-06 WL#5461 PERFORMANCE_SCHEMA MY.CNF Default Setup Second phase of prototype with support for the following configuration option: pfs_instrument = ' = ' where ON = TRUE = 1 = ENABLED and OFF = FALSE = 0 = DISABLED and where ON = timed, counted OFF = not timed, not counted COUNTED = not timed, counted This option is read-only. The effect of the option can only be seen in the SETUP_INSTRUMENTS table. It is not visible via SHOW GLOBAL VARIABLES. modified: mysys/my_getopt.c sql/mysqld.cc sql/mysqld.h sql/sys_vars.cc storage/perfschema/pfs_instr_class.cc storage/perfschema/pfs_instr_class.h storage/perfschema/pfs_server.cc storage/perfschema/pfs_server.h Diff too large for email (27871 lines, the limit is 10000). No bundle (reason: useless for push emails).