3554 Marc Alff 2011-01-26 [merge]
Local merge
modified:
mysql-test/r/innodb_mysql_sync.result
mysql-test/suite/rpl/t/disabled.def
mysql-test/t/innodb_mysql_sync.test
sql/ha_partition.cc
sql/handler.h
sql/sql_table.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/handler0alter.cc
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental 2011-01-18 17:52:48 +0000
+++ b/mysql-test/collections/default.experimental 2011-01-26 14:41:43 +0000
@@ -40,3 +40,8 @@ rpl_bhs.*
main.gis-rtree # svoj: due to BUG#38965
main.type_float # svoj: due to BUG#38965
main.type_newdecimal # svoj: due to BUG#38965
+
+# Not a test, utility to troubleshoot test failures
+# Flagged as experimental since output will vary
+performance_schema.debug_env # Bug#59740 2011-02-26 Marc Alff, script needed to investigate the failure
+
=== added file 'mysql-test/suite/perfschema/r/debug_env.result'
--- a/mysql-test/suite/perfschema/r/debug_env.result 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/perfschema/r/debug_env.result 2011-01-26 14:41:43 +0000
@@ -0,0 +1,152 @@
+"============================================================================"
+"This is not a test, it's a debug utility to troubleshoot test suite problems"
+"This script is flagged as experimental, as failures are expected"
+"============================================================================"
+show engines;
+Engine Support Comment Transactions XA Savepoints
+FEDERATED NO Federated MySQL storage engine NULL NULL NULL
+MRG_MYISAM YES Collection of identical MyISAM tables NO NO NO
+MyISAM DEFAULT MyISAM storage engine NO NO NO
+BLACKHOLE YES /dev/null storage engine (anything you write to it disappears) NO NO NO
+CSV YES CSV storage engine NO NO NO
+MEMORY YES Hash based, stored in memory, useful for temporary tables NO NO NO
+ARCHIVE YES Archive storage engine NO NO NO
+InnoDB YES Supports transactions, row-level locking, and foreign keys YES YES YES
+PERFORMANCE_SCHEMA YES Performance Schema NO NO NO
+show status like "performance_schema%";
+Variable_name Value
+Performance_schema_cond_classes_lost 0
+Performance_schema_cond_instances_lost 0
+Performance_schema_file_classes_lost 0
+Performance_schema_file_handles_lost 0
+Performance_schema_file_instances_lost 0
+Performance_schema_locker_lost 0
+Performance_schema_mutex_classes_lost 0
+Performance_schema_mutex_instances_lost 0
+Performance_schema_rwlock_classes_lost 0
+Performance_schema_rwlock_instances_lost 0
+Performance_schema_table_handles_lost 0
+Performance_schema_table_instances_lost 0
+Performance_schema_thread_classes_lost 0
+Performance_schema_thread_instances_lost 0
+show variables like "performance_schema%";
+Variable_name Value
+performance_schema ON
+performance_schema_events_waits_history_long_size 10000
+performance_schema_events_waits_history_size 10
+performance_schema_max_cond_classes 80
+performance_schema_max_cond_instances 1000
+performance_schema_max_file_classes 50
+performance_schema_max_file_handles 32768
+performance_schema_max_file_instances 10000
+performance_schema_max_mutex_classes 200
+performance_schema_max_mutex_instances 10000
+performance_schema_max_rwlock_classes 30
+performance_schema_max_rwlock_instances 10000
+performance_schema_max_table_handles 1000
+performance_schema_max_table_instances 500
+performance_schema_max_thread_classes 50
+performance_schema_max_thread_instances 1000
+performance_schema_setup_actors_size 100
+performance_schema_setup_objects_size 100
+show engine performance_schema status;
+Type Name Status
+performance_schema events_waits_current.row_size 136
+performance_schema events_waits_current.row_count 3000
+performance_schema events_waits_history.row_size 136
+performance_schema events_waits_history.row_count 10000
+performance_schema events_waits_history.memory 1360000
+performance_schema events_waits_history_long.row_size 136
+performance_schema events_waits_history_long.row_count 10000
+performance_schema events_waits_history_long.memory 1360000
+performance_schema (pfs_mutex_class).row_size 192
+performance_schema (pfs_mutex_class).row_count 200
+performance_schema (pfs_mutex_class).memory 38400
+performance_schema (pfs_rwlock_class).row_size 224
+performance_schema (pfs_rwlock_class).row_count 30
+performance_schema (pfs_rwlock_class).memory 6720
+performance_schema (pfs_cond_class).row_size 176
+performance_schema (pfs_cond_class).row_count 80
+performance_schema (pfs_cond_class).memory 14080
+performance_schema (pfs_thread_class).row_size 144
+performance_schema (pfs_thread_class).row_count 50
+performance_schema (pfs_thread_class).memory 7200
+performance_schema (pfs_file_class).row_size 200
+performance_schema (pfs_file_class).row_count 50
+performance_schema (pfs_file_class).memory 10000
+performance_schema mutex_instances.row_size 104
+performance_schema mutex_instances.row_count 10000
+performance_schema mutex_instances.memory 1040000
+performance_schema rwlock_instances.row_size 152
+performance_schema rwlock_instances.row_count 10000
+performance_schema rwlock_instances.memory 1520000
+performance_schema cond_instances.row_size 72
+performance_schema cond_instances.row_count 1000
+performance_schema cond_instances.memory 72000
+performance_schema threads.row_size 888
+performance_schema threads.row_count 1000
+performance_schema threads.memory 888000
+performance_schema file_instances.row_size 608
+performance_schema file_instances.row_count 10000
+performance_schema file_instances.memory 6080000
+performance_schema (pfs_file_handle).row_size 8
+performance_schema (pfs_file_handle).row_count 32768
+performance_schema (pfs_file_handle).memory 262144
+performance_schema events_waits_summary_by_thread_by_event_name.row_size 32
+performance_schema events_waits_summary_by_thread_by_event_name.row_count 362000
+performance_schema events_waits_summary_by_thread_by_event_name.memory 11584000
+performance_schema (pfs_table_share).row_size 21664
+performance_schema (pfs_table_share).row_count 500
+performance_schema (pfs_table_share).memory 10832000
+performance_schema (pfs_table).row_size 8704
+performance_schema (pfs_table).row_count 1000
+performance_schema (pfs_table).memory 8704000
+performance_schema setup_actors.row_size 240
+performance_schema setup_actors.row_count 100
+performance_schema setup_actors.memory 24000
+performance_schema setup_objects.row_size 432
+performance_schema setup_objects.row_count 100
+performance_schema setup_objects.memory 43200
+performance_schema events_waits_summary_global_by_event_name.row_size 32
+performance_schema events_waits_summary_global_by_event_name.row_count 362
+performance_schema events_waits_summary_global_by_event_name.memory 11584
+performance_schema performance_schema.memory 43857328
+use performance_schema;
+show tables;
+Tables_in_performance_schema
+cond_instances
+events_waits_current
+events_waits_history
+events_waits_history_long
+events_waits_summary_by_instance
+events_waits_summary_by_thread_by_event_name
+events_waits_summary_global_by_event_name
+file_instances
+file_summary_by_event_name
+file_summary_by_instance
+mutex_instances
+objects_summary_global_by_type
+performance_timers
+rwlock_instances
+setup_actors
+setup_consumers
+setup_instruments
+setup_objects
+setup_timers
+table_io_waits_summary_by_index_usage
+table_io_waits_summary_by_table
+table_lock_waits_summary_by_table
+threads
+select * from performance_timers;
+TIMER_NAME TIMER_FREQUENCY TIMER_RESOLUTION TIMER_OVERHEAD
+select * from setup_timers;
+NAME TIMER_NAME
+wait CYCLE
+select * from threads;
+THREAD_ID NAME TYPE PROCESSLIST_ID PROCESSLIST_USER PROCESSLIST_HOST PROCESSLIST_DB PROCESSLIST_COMMAND PROCESSLIST_TIME PROCESSLIST_STATE PROCESSLIST_INFO PARENT_THREAD_ID ROLE INSTRUMENTED
+select count(*) from setup_instruments;
+count(*)
+220
+select count(*) from events_waits_summary_by_thread_by_event_name;
+count(*)
+3080
=== added file 'mysql-test/suite/perfschema/t/debug_env.test'
--- a/mysql-test/suite/perfschema/t/debug_env.test 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/perfschema/t/debug_env.test 2011-01-26 14:41:43 +0000
@@ -0,0 +1,42 @@
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
+
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- echo "============================================================================"
+-- echo "This is not a test, it's a debug utility to troubleshoot test suite problems"
+-- echo "This script is flagged as experimental, as failures are expected"
+-- echo "============================================================================"
+
+show engines;
+show status like "performance_schema%";
+show variables like "performance_schema%";
+show engine performance_schema status;
+
+use performance_schema;
+show tables;
+
+select * from performance_timers;
+select * from setup_timers;
+
+# Investigating bug#59740
+select * from threads;
+select count(*) from setup_instruments;
+select count(*) from events_waits_summary_by_thread_by_event_name;
+
+
=== modified file 'mysql-test/suite/perfschema/t/disabled.def'
--- a/mysql-test/suite/perfschema/t/disabled.def 2010-11-12 13:10:44 +0000
+++ b/mysql-test/suite/perfschema/t/disabled.def 2011-01-26 14:41:43 +0000
@@ -25,3 +25,41 @@
#
##############################################################################
+ortho_iter : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_aggregate_global_2u_2t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_aggregate_global_2u_3t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_aggregate_global_4u_2t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_aggregate_global_4u_3t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_aggregate_hist_2u_2t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_aggregate_hist_2u_3t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_aggregate_hist_4u_2t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_aggregate_hist_4u_3t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_aggregate_thread_2u_2t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_aggregate_thread_2u_3t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_aggregate_thread_4u_2t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_aggregate_thread_4u_3t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_io_aggregate_global_2u_2t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_io_aggregate_global_2u_3t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_io_aggregate_global_4u_2t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_io_aggregate_global_4u_3t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_io_aggregate_hist_2u_2t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_io_aggregate_hist_2u_3t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_io_aggregate_hist_4u_2t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_io_aggregate_hist_4u_3t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_io_aggregate_thread_2u_2t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_io_aggregate_thread_2u_3t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_io_aggregate_thread_4u_2t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_io_aggregate_thread_4u_3t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_lock_aggregate_global_2u_2t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_lock_aggregate_global_2u_3t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_lock_aggregate_global_4u_2t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_lock_aggregate_global_4u_3t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_lock_aggregate_hist_2u_2t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_lock_aggregate_hist_2u_3t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_lock_aggregate_hist_4u_2t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_lock_aggregate_hist_4u_3t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_lock_aggregate_thread_2u_2t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_lock_aggregate_thread_2u_3t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_lock_aggregate_thread_4u_2t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+table_lock_aggregate_thread_4u_3t : BUG#59740 2011-02-26 Marc Alff Test fails on FreeBSD
+
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (marc.alff:3554) | Marc Alff | 26 Jan |
