From d845bcc3dc07c2f59229ed074a07ae2493d4a110 Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Fri, 2 Aug 2013 19:52:26 +0400 Subject: MDEV-4786 - merge 10.0-monty - 10.0 Fixed perfschema.relaylog failure. mysql-test/suite/perfschema/r/relaylog.result: Failed file opens are not shown in P_S. Relevant revision: marc.alff@oracle.com-20120807154151-cwuazxu341rvrnmg --- mysql-test/suite/perfschema/r/relaylog.result | 4 ---- 1 file changed, 4 deletions(-) (limited to 'mysql-test/suite/perfschema') diff --git a/mysql-test/suite/perfschema/r/relaylog.result b/mysql-test/suite/perfschema/r/relaylog.result index 09968ff1bb6..beabb968ac8 100644 --- a/mysql-test/suite/perfschema/r/relaylog.result +++ b/mysql-test/suite/perfschema/r/relaylog.result @@ -23,7 +23,6 @@ where file_name like "%master-%" order by file_name; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE master-bin.000001 wait/io/file/sql/binlog MANY MANY MANY MANY master-bin.index wait/io/file/sql/binlog_index MANY MANY MANY MANY -master-bin.state wait/io/file/sql/binlog_state NONE NONE NONE NONE select * from performance_schema.file_summary_by_instance where file_name like "%slave-%" order by file_name; FILE_NAME EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT COUNT_READ SUM_TIMER_READ MIN_TIMER_READ AVG_TIMER_READ MAX_TIMER_READ SUM_NUMBER_OF_BYTES_READ COUNT_WRITE SUM_TIMER_WRITE MIN_TIMER_WRITE AVG_TIMER_WRITE MAX_TIMER_WRITE SUM_NUMBER_OF_BYTES_WRITE COUNT_MISC SUM_TIMER_MISC MIN_TIMER_MISC AVG_TIMER_MISC MAX_TIMER_MISC @@ -40,7 +39,6 @@ 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 master-bin.000001 wait/io/file/sql/binlog MANY MANY MANY MANY master-bin.index wait/io/file/sql/binlog_index MANY MANY MANY MANY -master-bin.state wait/io/file/sql/binlog_state NONE NONE NONE NONE select EVENT_NAME, if (count_read > 0, "MANY", "NONE") as COUNT_READ, @@ -103,7 +101,6 @@ order by file_name; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE slave-bin.000001 wait/io/file/sql/binlog MANY MANY MANY MANY slave-bin.index wait/io/file/sql/binlog_index MANY MANY MANY MANY -slave-bin.state wait/io/file/sql/binlog_state NONE NONE NONE NONE slave-relay-bin.000001 wait/io/file/sql/relaylog MANY MANY MANY MANY slave-relay-bin.000002 wait/io/file/sql/relaylog MANY MANY MANY MANY slave-relay-bin.index wait/io/file/sql/relaylog_index MANY MANY MANY MANY @@ -120,7 +117,6 @@ 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 slave-bin.000001 wait/io/file/sql/binlog MANY MANY MANY MANY slave-bin.index wait/io/file/sql/binlog_index MANY MANY MANY MANY -slave-bin.state wait/io/file/sql/binlog_state NONE NONE NONE NONE select EVENT_NAME, if (count_read > 0, "MANY", "NONE") as COUNT_READ, -- cgit v1.2.1