From: Christopher Powers Date: September 12 2010 4:41am Subject: bzr push into mysql-next-mr-wl4896 branch (chris.powers:3169 to 3170) WL#4896 List-Archive: http://lists.mysql.com/commits/118042 Message-Id: <20100912044201.4AD411DB031A@xeno.mysql.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2874151721032837511==" --===============2874151721032837511== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3170 Christopher Powers 2010-09-11 WL#4896 "PERFORMANCE_SCHEMA Network IO" Get PB green: More perfschema tests modified to accommodate "wait/io/socket", SOCKET_INSTANCE, etc. modified: mysql-test/suite/perfschema/r/privilege_table_io.result mysql-test/suite/perfschema/r/rollback_table_io.result mysql-test/suite/perfschema/r/schema.result mysql-test/suite/perfschema/r/temp_table_io.result mysql-test/suite/perfschema/r/trigger_table_io.result mysql-test/suite/perfschema/r/view_table_io.result 3169 Christopher Powers 2010-09-10 WL#4896 PERFORMANCE_SCHEMA Network IO Get PB green: Updated perfschema tests modified: mysql-test/r/mysqld--help-notwin.result mysql-test/suite/perfschema/r/aggregate.result mysql-test/suite/perfschema/r/innodb_table_io.result mysql-test/suite/perfschema/r/memory_table_io.result mysql-test/suite/perfschema/r/merge_table_io.result mysql-test/suite/perfschema/r/multi_table_io.result mysql-test/suite/perfschema/r/myisam_file_io.result mysql-test/suite/perfschema/r/myisam_table_io.result mysql-test/suite/perfschema/r/part_table_io.result mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result mysql-test/suite/perfschema/t/aggregate.test === modified file 'mysql-test/suite/perfschema/r/privilege_table_io.result' --- a/mysql-test/suite/perfschema/r/privilege_table_io.result 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/r/privilege_table_io.result 2010-09-12 04:41:24 +0000 @@ -52,6 +52,7 @@ 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_socket_instances_lost 0 Performance_schema_table_handles_lost 0 Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 === modified file 'mysql-test/suite/perfschema/r/rollback_table_io.result' --- a/mysql-test/suite/perfschema/r/rollback_table_io.result 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/r/rollback_table_io.result 2010-09-12 04:41:24 +0000 @@ -64,6 +64,7 @@ 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_socket_instances_lost 0 Performance_schema_table_handles_lost 0 Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 === modified file 'mysql-test/suite/perfschema/r/schema.result' --- a/mysql-test/suite/perfschema/r/schema.result 2010-08-12 14:08:52 +0000 +++ b/mysql-test/suite/perfschema/r/schema.result 2010-09-12 04:41:24 +0000 @@ -24,6 +24,7 @@ RWLOCK_INSTANCES SETUP_CONSUMERS SETUP_INSTRUMENTS SETUP_TIMERS +SOCKET_INSTANCES THREADS show create table COND_INSTANCES; Table Create Table === modified file 'mysql-test/suite/perfschema/r/temp_table_io.result' --- a/mysql-test/suite/perfschema/r/temp_table_io.result 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/r/temp_table_io.result 2010-09-12 04:41:24 +0000 @@ -122,6 +122,7 @@ 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_socket_instances_lost 0 Performance_schema_table_handles_lost 0 Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 === modified file 'mysql-test/suite/perfschema/r/trigger_table_io.result' --- a/mysql-test/suite/perfschema/r/trigger_table_io.result 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/r/trigger_table_io.result 2010-09-12 04:41:24 +0000 @@ -180,6 +180,7 @@ 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_socket_instances_lost 0 Performance_schema_table_handles_lost 0 Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 === modified file 'mysql-test/suite/perfschema/r/view_table_io.result' --- a/mysql-test/suite/perfschema/r/view_table_io.result 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/r/view_table_io.result 2010-09-12 04:41:24 +0000 @@ -131,6 +131,7 @@ 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_socket_instances_lost 0 Performance_schema_table_handles_lost 0 Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 --===============2874151721032837511== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/chris.powers@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chris.powers@stripped # target_branch: file:///home/cpowers/work/dev/base_mysql-next-mr-\ # wl4896/ # testament_sha1: 888fe1bdfe59dbe8fa38db1185151815b61217a5 # timestamp: 2010-09-11 23:42:00 -0500 # source_branch: bzr+ssh://cpowers@stripped/bzrroot\ # /server/mysql-next-mr/ # base_revision_id: chris.powers@stripped\ # bij3o2mwhvt8ws4o # # Begin bundle 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 wGS9wD0ttMDBHO1KmZWj/F3JFOFCQJnnhmA= --===============2874151721032837511==--