3539 Marc Alff 2011-01-21 [merge]
Merge mysql-trunk-wl5379 --> mysql-trunk
WL#5371 PERFORMANCE_SCHEMA Instrumenting Table Locks
WL#5379 PERFORMANCE SCHEMA TABLE / INDEX IO SUMMARY
WL#5420 PERFORMANCE SCHEMA TABLE LOCK WAIT SUMMARY
added:
mysql-test/suite/perfschema/include/event_aggregate_cleanup.inc
mysql-test/suite/perfschema/include/event_aggregate_load.inc
mysql-test/suite/perfschema/include/event_aggregate_setup.inc
mysql-test/suite/perfschema/include/table_aggregate_cleanup.inc
mysql-test/suite/perfschema/include/table_aggregate_load.inc
mysql-test/suite/perfschema/include/table_aggregate_setup.inc
mysql-test/suite/perfschema/r/ddl_tiws_by_index_usage.result
mysql-test/suite/perfschema/r/ddl_tiws_by_table.result
mysql-test/suite/perfschema/r/ddl_tlws_by_table.result
mysql-test/suite/perfschema/r/dml_tiws_by_index_usage.result
mysql-test/suite/perfschema/r/dml_tiws_by_table.result
mysql-test/suite/perfschema/r/dml_tlws_by_table.result
mysql-test/suite/perfschema/r/event_aggregate.result
mysql-test/suite/perfschema/r/ortho_iter.result
mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result
mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result
mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result
mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result
mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result
mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result
mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result
mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result
mysql-test/suite/perfschema/r/table_aggregate_off.result
mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result
mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result
mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result
mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result
mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result
mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result
mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result
mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result
mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result
mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result
mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result
mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result
mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result
mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result
mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result
mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result
mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result
mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result
mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result
mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result
mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result
mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result
mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result
mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result
mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result
mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result
mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result
mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result
mysql-test/suite/perfschema/t/ddl_tiws_by_index_usage.test
mysql-test/suite/perfschema/t/ddl_tiws_by_table.test
mysql-test/suite/perfschema/t/ddl_tlws_by_table.test
mysql-test/suite/perfschema/t/dml_tiws_by_index_usage.test
mysql-test/suite/perfschema/t/dml_tiws_by_table.test
mysql-test/suite/perfschema/t/dml_tlws_by_table.test
mysql-test/suite/perfschema/t/event_aggregate-master.opt
mysql-test/suite/perfschema/t/event_aggregate.test
mysql-test/suite/perfschema/t/ortho_iter.test
mysql-test/suite/perfschema/t/table_aggregate_global_2u_2t.test
mysql-test/suite/perfschema/t/table_aggregate_global_2u_3t.test
mysql-test/suite/perfschema/t/table_aggregate_global_4u_2t.test
mysql-test/suite/perfschema/t/table_aggregate_global_4u_3t.test
mysql-test/suite/perfschema/t/table_aggregate_hist_2u_2t.test
mysql-test/suite/perfschema/t/table_aggregate_hist_2u_3t.test
mysql-test/suite/perfschema/t/table_aggregate_hist_4u_2t.test
mysql-test/suite/perfschema/t/table_aggregate_hist_4u_3t.test
mysql-test/suite/perfschema/t/table_aggregate_off.test
mysql-test/suite/perfschema/t/table_aggregate_thread_2u_2t.test
mysql-test/suite/perfschema/t/table_aggregate_thread_2u_3t.test
mysql-test/suite/perfschema/t/table_aggregate_thread_4u_2t.test
mysql-test/suite/perfschema/t/table_aggregate_thread_4u_3t.test
mysql-test/suite/perfschema/t/table_io_aggregate_global_2u_2t.test
mysql-test/suite/perfschema/t/table_io_aggregate_global_2u_3t.test
mysql-test/suite/perfschema/t/table_io_aggregate_global_4u_2t.test
mysql-test/suite/perfschema/t/table_io_aggregate_global_4u_3t.test
mysql-test/suite/perfschema/t/table_io_aggregate_hist_2u_2t.test
mysql-test/suite/perfschema/t/table_io_aggregate_hist_2u_3t.test
mysql-test/suite/perfschema/t/table_io_aggregate_hist_4u_2t.test
mysql-test/suite/perfschema/t/table_io_aggregate_hist_4u_3t.test
mysql-test/suite/perfschema/t/table_io_aggregate_thread_2u_2t.test
mysql-test/suite/perfschema/t/table_io_aggregate_thread_2u_3t.test
mysql-test/suite/perfschema/t/table_io_aggregate_thread_4u_2t.test
mysql-test/suite/perfschema/t/table_io_aggregate_thread_4u_3t.test
mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_2t.test
mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_3t.test
mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_2t.test
mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_3t.test
mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_2t.test
mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_3t.test
mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_2t.test
mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_3t.test
mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_2t.test
mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_3t.test
mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_2t.test
mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_3t.test
storage/perfschema/pfs_visitor.cc
storage/perfschema/pfs_visitor.h
storage/perfschema/table_tiws_by_index_usage.cc
storage/perfschema/table_tiws_by_index_usage.h
storage/perfschema/table_tiws_by_table.cc
storage/perfschema/table_tiws_by_table.h
storage/perfschema/table_tlws_by_table.cc
storage/perfschema/table_tlws_by_table.h
modified:
include/mysql/psi/mysql_table.h
include/mysql/psi/psi.h
include/mysql/psi/psi_abi_v1.h.pp
include/mysql/psi/psi_abi_v2.h.pp
mysql-test/suite/perfschema/include/schema.inc
mysql-test/suite/perfschema/include/start_server_common.inc
mysql-test/suite/perfschema/r/func_file_io.result
mysql-test/suite/perfschema/r/information_schema.result
mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result
mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result
mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result
mysql-test/suite/perfschema/r/schema_lc0.result
mysql-test/suite/perfschema/r/schema_lc1.result
mysql-test/suite/perfschema/r/schema_lc2.result
mysql-test/suite/perfschema/r/start_server_no_cond_class.result
mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
mysql-test/suite/perfschema/r/start_server_no_file_class.result
mysql-test/suite/perfschema/r/start_server_no_file_inst.result
mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
mysql-test/suite/perfschema/r/start_server_no_setup_actors.result
mysql-test/suite/perfschema/r/start_server_no_setup_objects.result
mysql-test/suite/perfschema/r/start_server_no_table_hdl.result
mysql-test/suite/perfschema/r/start_server_no_table_inst.result
mysql-test/suite/perfschema/r/start_server_no_thread_class.result
mysql-test/suite/perfschema/r/start_server_no_thread_inst.result
mysql-test/suite/perfschema/r/start_server_nothing.result
mysql-test/suite/perfschema/r/start_server_off.result
mysql-test/suite/perfschema/r/start_server_on.result
mysys/thr_lock.c
scripts/mysql_system_tables.sql
sql/handler.cc
storage/perfschema/CMakeLists.txt
storage/perfschema/pfs.cc
storage/perfschema/pfs_column_types.h
storage/perfschema/pfs_engine_table.cc
storage/perfschema/pfs_events_waits.cc
storage/perfschema/pfs_events_waits.h
storage/perfschema/pfs_instr.cc
storage/perfschema/pfs_instr.h
storage/perfschema/pfs_instr_class.cc
storage/perfschema/pfs_instr_class.h
storage/perfschema/pfs_lock.h
storage/perfschema/pfs_stat.h
storage/perfschema/table_events_waits.cc
storage/perfschema/table_events_waits.h
storage/perfschema/table_ews_by_thread_by_event_name.cc
storage/perfschema/table_ews_by_thread_by_event_name.h
storage/perfschema/table_ews_global_by_event_name.cc
storage/perfschema/table_ews_global_by_event_name.h
storage/perfschema/table_helper.cc
storage/perfschema/table_helper.h
storage/perfschema/table_os_global_by_type.cc
storage/perfschema/table_setup_instruments.cc
3538 Olav Sandstaa 2011-01-20
Follow-up patch for test case for Bug #58816.
The test case turns off index condition pushdown as part of the test
but does not restore it to the value it had before the test case. This
makes all test cases following it run with index condition pushdown
turned off. The fix is to save the value of optimzier_switch before the
test starts and restore it after the test.
@ mysql-test/include/icp_tests.inc
Save the value of the optimizer switch before the test case
for Bug#58816 and restore it after.
@ mysql-test/r/innodb_icp.result
Save the value of the optimizer switch before the test case
for Bug#58816 and restore it after.
@ mysql-test/r/innodb_icp_none.result
Save the value of the optimizer switch before the test case
for Bug#58816 and restore it after.
@ mysql-test/r/myisam_icp.result
Save the value of the optimizer switch before the test case
for Bug#58816 and restore it after.
@ mysql-test/r/myisam_icp_none.result
Save the value of the optimizer switch before the test case
for Bug#58816 and restore it after.
modified:
mysql-test/include/icp_tests.inc
mysql-test/r/innodb_icp.result
mysql-test/r/innodb_icp_none.result
mysql-test/r/myisam_icp.result
mysql-test/r/myisam_icp_none.result
Diff too large for email (49598 lines, the limit is 10000).
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (marc.alff:3538 to 3539) | Marc Alff | 21 Jan |
