From: Marc Alff Date: September 7 2012 6:31pm Subject: bzr push into mysql-trunk branch (marc.alff:4444 to 4445) List-Archive: http://lists.mysql.com/commits/144710 Message-Id: <201209071831.q87IVYIt013993@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4445 Marc Alff 2012-09-07 [merge] Merge mysql-5.6 --> mysql-trunk modified: mysql-test/suite/perfschema/r/func_file_io.result mysql-test/suite/perfschema/r/func_mutex.result mysql-test/suite/perfschema/t/func_file_io.test mysql-test/suite/perfschema/t/func_mutex.test 4444 Tor Didriksen 2012-09-07 [merge] merge 5.6 => trunk added: unittest/gunit/handler-t.cc unittest/gunit/handler-t.h modified: sql/item_subselect.cc sql/sql_executor.cc sql/sql_executor.h unittest/gunit/CMakeLists.txt unittest/gunit/fake_table.h unittest/gunit/test_utils.cc === modified file 'mysql-test/suite/perfschema/r/func_file_io.result' --- a/mysql-test/suite/perfschema/r/func_file_io.result 2012-05-23 09:25:42 +0000 +++ b/mysql-test/suite/perfschema/r/func_file_io.result 2012-09-07 18:13:03 +0000 @@ -3,6 +3,7 @@ UPDATE performance_schema.setup_instrume WHERE name LIKE 'wait/io/file/%'; update performance_schema.threads SET instrumented = 'YES' WHERE PROCESSLIST_ID=connection_id(); +flush status; DROP TABLE IF EXISTS t1; CREATE TABLE t1 (id INT PRIMARY KEY, b CHAR(100) DEFAULT 'initial value') ENGINE=MyISAM; @@ -128,3 +129,28 @@ GROUP BY p.processlist_user, h.operation HAVING BYTES > 0 ORDER BY p.processlist_user, h.operation; UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES'; +show status like "performance_schema%"; +Variable_name Value +Performance_schema_accounts_lost 0 +Performance_schema_cond_classes_lost 0 +Performance_schema_cond_instances_lost 0 +Performance_schema_digest_lost 0 +Performance_schema_file_classes_lost 0 +Performance_schema_file_handles_lost 0 +Performance_schema_file_instances_lost 0 +Performance_schema_hosts_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_session_connect_attrs_lost 0 +Performance_schema_socket_classes_lost 0 +Performance_schema_socket_instances_lost 0 +Performance_schema_stage_classes_lost 0 +Performance_schema_statement_classes_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 +Performance_schema_users_lost 0 === modified file 'mysql-test/suite/perfschema/r/func_mutex.result' --- a/mysql-test/suite/perfschema/r/func_mutex.result 2012-05-21 17:56:02 +0000 +++ b/mysql-test/suite/perfschema/r/func_mutex.result 2012-09-07 18:13:03 +0000 @@ -2,6 +2,15 @@ UPDATE performance_schema.setup_instrume UPDATE performance_schema.setup_instruments SET enabled = 'YES' WHERE name LIKE 'wait/synch/mutex/%' OR name LIKE 'wait/synch/rwlock/%'; +flush status; +select NAME from performance_schema.mutex_instances +where NAME = 'wait/synch/mutex/sql/LOCK_open'; +NAME +wait/synch/mutex/sql/LOCK_open +select NAME from performance_schema.rwlock_instances +where NAME = 'wait/synch/rwlock/sql/LOCK_grant'; +NAME +wait/synch/rwlock/sql/LOCK_grant DROP TABLE IF EXISTS t1; CREATE TABLE t1 (id INT PRIMARY KEY, b CHAR(100) DEFAULT 'initial value') ENGINE=MyISAM; @@ -113,3 +122,28 @@ Success UPDATE performance_schema.setup_instruments SET enabled = 'YES'; DROP TABLE t1; UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES'; +show status like "performance_schema%"; +Variable_name Value +Performance_schema_accounts_lost 0 +Performance_schema_cond_classes_lost 0 +Performance_schema_cond_instances_lost 0 +Performance_schema_digest_lost 0 +Performance_schema_file_classes_lost 0 +Performance_schema_file_handles_lost 0 +Performance_schema_file_instances_lost 0 +Performance_schema_hosts_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_session_connect_attrs_lost 0 +Performance_schema_socket_classes_lost 0 +Performance_schema_socket_instances_lost 0 +Performance_schema_stage_classes_lost 0 +Performance_schema_statement_classes_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 +Performance_schema_users_lost 0 === modified file 'mysql-test/suite/perfschema/t/func_file_io.test' --- a/mysql-test/suite/perfschema/t/func_file_io.test 2012-05-23 09:25:42 +0000 +++ b/mysql-test/suite/perfschema/t/func_file_io.test 2012-09-07 18:13:03 +0000 @@ -15,6 +15,9 @@ WHERE name LIKE 'wait/io/file/%'; update performance_schema.threads SET instrumented = 'YES' WHERE PROCESSLIST_ID=connection_id(); +# reset lost counters +flush status; + --disable_warnings DROP TABLE IF EXISTS t1; --enable_warnings @@ -183,3 +186,7 @@ ORDER BY p.processlist_user, h.operation # Clean-up. UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES'; + +# In case of failure, will indicate the root cause +show status like "performance_schema%"; + === modified file 'mysql-test/suite/perfschema/t/func_mutex.test' --- a/mysql-test/suite/perfschema/t/func_mutex.test 2012-05-21 17:56:02 +0000 +++ b/mysql-test/suite/perfschema/t/func_mutex.test 2012-09-07 18:13:03 +0000 @@ -13,6 +13,15 @@ UPDATE performance_schema.setup_instrume WHERE name LIKE 'wait/synch/mutex/%' OR name LIKE 'wait/synch/rwlock/%'; +# reset lost counters +flush status; + +# Make sure objects are instrumented +select NAME from performance_schema.mutex_instances + where NAME = 'wait/synch/mutex/sql/LOCK_open'; +select NAME from performance_schema.rwlock_instances + where NAME = 'wait/synch/rwlock/sql/LOCK_grant'; + --disable_warnings DROP TABLE IF EXISTS t1; --enable_warnings @@ -119,3 +128,6 @@ DROP TABLE t1; UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES'; +# In case of failure, will indicate the root cause +show status like "performance_schema%"; + No bundle (reason: useless for push emails).