From: Marc Alff
Date: March 10 2011 8:00am
Subject: bzr commit into mysql-5.5 branch (marc.alff:3358)
List-Archive: http://lists.mysql.com/commits/132729
Message-Id: <201103100801.p2A1lpjV013259@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4945634642298755796=="

--===============4945634642298755796==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/malff/BZR_TREE/mysql-5.5-bug11766528/ based on revid:marc.alff@stripped

 3358 Marc Alff	2011-03-10
      Implemented code review comments,
      improved the result file readability.

    modified:
      mysql-test/suite/perfschema/r/relaylog.result
      mysql-test/suite/perfschema/t/relaylog.test
=== modified file 'mysql-test/suite/perfschema/r/relaylog.result'
--- a/mysql-test/suite/perfschema/r/relaylog.result	2011-03-01 16:39:28 +0000
+++ b/mysql-test/suite/perfschema/r/relaylog.result	2011-03-10 08:00:43 +0000
@@ -17,6 +17,7 @@ FILE_NAME	EVENT_NAME	COUNT_READ	COUNT_WR
 select * from performance_schema.file_summary_by_instance
 where file_name like "%slave-%" order by file_name;
 FILE_NAME	EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
+"Expect a master binlog + binlog_index"
 select * from performance_schema.file_summary_by_instance
 where event_name like "%binlog%" order by file_name;
 FILE_NAME	EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
@@ -35,6 +36,7 @@ wait/synch/cond/sql/MYSQL_BIN_LOG::COND_
 wait/synch/cond/sql/MYSQL_BIN_LOG::update_cond	1
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index	3
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_prep_xids	0
+"Expect no slave relay log"
 select * from performance_schema.file_summary_by_instance
 where event_name like "%relaylog%" order by file_name;
 FILE_NAME	EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
@@ -60,6 +62,7 @@ FILE_NAME	EVENT_NAME	COUNT_READ	COUNT_WR
 [DATADIR]slave-relay-bin.000001	wait/io/file/sql/relaylog	4	3	370	263
 [DATADIR]slave-relay-bin.000002	wait/io/file/sql/relaylog	2	4	368	368
 [DATADIR]slave-relay-bin.index	wait/io/file/sql/relaylog_index	2	4	50	125
+"Expect a slave binlog + binlog_index"
 select * from performance_schema.file_summary_by_instance
 where event_name like "%binlog%" order by file_name;
 FILE_NAME	EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
@@ -78,6 +81,7 @@ wait/synch/cond/sql/MYSQL_BIN_LOG::COND_
 wait/synch/cond/sql/MYSQL_BIN_LOG::update_cond	0
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index	5
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_prep_xids	0
+"Expect a slave relay log"
 select * from performance_schema.file_summary_by_instance
 where event_name like "%relaylog%" order by file_name;
 FILE_NAME	EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE

=== modified file 'mysql-test/suite/perfschema/t/relaylog.test'
--- a/mysql-test/suite/perfschema/t/relaylog.test	2011-03-01 16:39:28 +0000
+++ b/mysql-test/suite/perfschema/t/relaylog.test	2011-03-10 08:00:43 +0000
@@ -44,7 +44,7 @@ select * from performance_schema.file_su
 select * from performance_schema.file_summary_by_instance
   where file_name like "%slave-%" order by file_name;
 
-# Expect a master binlog + binlog_index
+-- echo "Expect a master binlog + binlog_index"
 
 --replace_result $MYSQLD_DATADIR [DATADIR]
 select * from performance_schema.file_summary_by_instance
@@ -57,7 +57,7 @@ select event_name, count_star
   from performance_schema.events_waits_summary_global_by_event_name
   where event_name like "%MYSQL_BIN_LOG%" order by event_name;
 
-# Expect no slave relay log.
+-- echo "Expect no slave relay log"
 
 --replace_result $MYSQLD_DATADIR [DATADIR]
 select * from performance_schema.file_summary_by_instance
@@ -82,7 +82,7 @@ select * from performance_schema.file_su
 select * from performance_schema.file_summary_by_instance
   where file_name like "%slave-%" order by file_name;
 
-# Expect a slave binlog + binlog_index
+-- echo "Expect a slave binlog + binlog_index"
 
 --replace_result $MYSQLD_DATADIR [DATADIR]
 select * from performance_schema.file_summary_by_instance
@@ -95,7 +95,7 @@ select event_name, count_star
   from performance_schema.events_waits_summary_global_by_event_name
   where event_name like "%MYSQL_BIN_LOG%" order by event_name;
 
-# Expect a slave relay log.
+-- echo "Expect a slave relay log"
 
 --replace_result $MYSQLD_DATADIR [DATADIR]
 select * from performance_schema.file_summary_by_instance


--===============4945634642298755796==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/marc.alff@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///Users/malff/BZR_TREE/mysql-5.5-bug11766528/
# testament_sha1: 902f02740b0bbaf31b9c873010cd12e9b5cf3fd6
# timestamp: 2011-03-10 09:00:54 +0100
# base_revision_id: marc.alff@stripped\
#   9t3p4h6iovs7cxfg
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXDAtf8AAlxfgAAQUG//93Ii
AAC////wUASWPW1INg6oNCEpJB6IaGmQ0xqeUyeoAAAEpNBNJmQ0Cmmmg0AAAASKApPIj0R5TQya
DRoyZAAMAANAAGTQAABoBJFMpgRqeCZDEVPTxKafqQz0mjTDHV4wYJ59+GCw0aiGSyxtECilWcDS
NhoteT62vmGTYFxrKjbBsW/akfEq3YZbozWZtzpCTUWjM4tur247Be5uNAbvvUFJnD9ow3mBQsgV
SakZxkAr+9DbbeXp5sMZHPf2EK7ER097bbcUDkw+N4RDoGFSPdCxPehGvrsuD3luENc8vMSzEsRc
pbikXmXBURkZFq1jhBcjOdsgAwIzJg0AmKg5owJjxUAeBHgDToHAMcDUi5fk1OG0SbXYSgeJkIwM
jn2lBLK0hGomPSia+yffdX6piEEifUqTQ1YpobE76POZxMbFkjuKHFlrtqONcQqdIIG/viRkg9hi
Fa/QHpairICe+OMRQR7F9+Uu0sqmugQQYjoIsBhUbsq8iGW+nc9lCNCw3Qs4IY0mY3OSbAWaC0QM
bGnG9Rhvqs3NHlySwIU2ocg17rxdaUIGyYR3oXQL6F9YVGZrdEobyRoPjtCuQxwr7ULW1Kaz1Fww
B4E9txu1nmcEL8KMvK4XuI5kUvvC060HFtipEwg1UMtgDpGwcQYPyGjmW2VoErHjqFQqjEMsh5pn
GZK2RJLcazOik7ggY7bMzpMV8VSsQcHNTRSr8Fx6cReazAdmY5f8d7hKeiVmTM3l5QMSiqA3YHRp
rAKBWkguFhoTYb/mQw+nUSkOoFciMwOol1vLo+vxmJVJMj6AHXdViN2JHJxrOfsEOQGn7DvE9UK1
JdzQ3FJ3Xf1Iz+3HleFrsJW5iTXRArRMOrNHwVFIRCweYgiqe0x/uEoZZqaAEfkzTBvrkAO8SkxP
IFFg4muFaoIRaEjxsbG1BlAwTyxSUPwqdRwurb28uXCMGWNaZwsOPB+mGssE0ocAYUJgiiNNJNPd
aDqViIzSKIbSSoiRp0Q9DmihYyAsKxE7MFIdRNzD0vQ3IWSnYJA2pDmuYcivv8obZ0zVaVcCm7wi
cJIgfGNkLUZo2o6ZwGxA8mJYZgVovDxwChFDg4mEaqcSYOP72iUjWa8g4B5E4SBVzEsUeT8Jh+M5
0VRZw2Vj0H2A2RXzsdoonIyIJGxYCBOk7IZcfqFp/plXcIHAKo3SOAfwl4otWiCupiReg7QPVGa9
jCS7gJkPRnGRw6bzLR1MkHeCSpRHVhmkSk/Can+nU/WhXvWQgEOyG3QnXNpjBDGwPrSLrMismQ4M
+gtWGqtYc6fZGxzgEWdzbgtoTeB8gnw0rKEUokYL94NeBcG8enWdFgbRbaVOJ0eAeYoAkBEMEagP
oCKLrAmQtcRancqf4u5IpwoSDhgWv+A=


--===============4945634642298755796==--