diff options
Diffstat (limited to 'mysql-test/suite/perfschema/r/rpl_gtid_func.result')
| -rw-r--r-- | mysql-test/suite/perfschema/r/rpl_gtid_func.result | 67 |
1 files changed, 66 insertions, 1 deletions
diff --git a/mysql-test/suite/perfschema/r/rpl_gtid_func.result b/mysql-test/suite/perfschema/r/rpl_gtid_func.result index b07c29a054c..cbe2a7c2246 100644 --- a/mysql-test/suite/perfschema/r/rpl_gtid_func.result +++ b/mysql-test/suite/perfschema/r/rpl_gtid_func.result @@ -18,7 +18,7 @@ update performance_schema.setup_instruments set enabled='YES', timed='NO'; connection master; select * from performance_schema.setup_instruments -where timed='NO'; +where timed='NO' and name not like "memory/%"; NAME ENABLED TIMED select "This better be in the master" as in_master_digest; in_master_digest @@ -28,16 +28,40 @@ values ('TABLE', 'master', 'foo', 'YES', 'YES'); select * from performance_schema.setup_objects order by object_type, object_schema, object_name; OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME ENABLED TIMED +EVENT % % YES YES +EVENT information_schema % NO NO +EVENT mysql % NO NO +EVENT performance_schema % NO NO +FUNCTION % % YES YES +FUNCTION information_schema % NO NO +FUNCTION mysql % NO NO +FUNCTION performance_schema % NO NO +PROCEDURE % % YES YES +PROCEDURE information_schema % NO NO +PROCEDURE mysql % NO NO +PROCEDURE performance_schema % NO NO TABLE % % YES YES TABLE information_schema % NO NO TABLE master foo YES YES TABLE mysql % NO NO TABLE performance_schema % NO NO +<<<<<<< HEAD select digest_text, count_star from performance_schema.events_statements_summary_by_digest where digest_text like "%in_%_digest%"; digest_text count_star SELECT ? AS `in_master_digest` 1 +======= +TRIGGER % % YES YES +TRIGGER information_schema % NO NO +TRIGGER mysql % NO NO +TRIGGER performance_schema % NO NO +select digest, digest_text, count_star +from performance_schema.events_statements_summary_by_digest +where digest_text like "%in_%_digest%"; +digest digest_text count_star +dc3177eb15d923e08c09eef29cecd9a4 SELECT ? AS `in_master_digest` 1 +>>>>>>> merge-perfschema-5.7 insert into test.marker values (2); connection slave; select * from test.marker; @@ -55,17 +79,42 @@ values ('TABLE', 'slave', 'foo', 'YES', 'YES'); select * from performance_schema.setup_objects order by object_type, object_schema, object_name; OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME ENABLED TIMED +EVENT % % YES YES +EVENT information_schema % NO NO +EVENT mysql % NO NO +EVENT performance_schema % NO NO +FUNCTION % % YES YES +FUNCTION information_schema % NO NO +FUNCTION mysql % NO NO +FUNCTION performance_schema % NO NO +PROCEDURE % % YES YES +PROCEDURE information_schema % NO NO +PROCEDURE mysql % NO NO +PROCEDURE performance_schema % NO NO TABLE % % YES YES TABLE information_schema % NO NO TABLE mysql % NO NO TABLE performance_schema % NO NO TABLE slave foo YES YES +<<<<<<< HEAD select digest_text, count_star from performance_schema.events_statements_summary_by_digest where digest_text like "%in_%_digest%"; digest_text count_star SELECT ? AS `in_slave_digest` 1 connection master; +======= +TRIGGER % % YES YES +TRIGGER information_schema % NO NO +TRIGGER mysql % NO NO +TRIGGER performance_schema % NO NO +select digest, digest_text, count_star +from performance_schema.events_statements_summary_by_digest +where digest_text like "%in_%_digest%"; +digest digest_text count_star +01f5f7c4c65eb61bb9a6afb7172c4a54 SELECT ? AS `in_slave_digest` 1 +**** On Master **** +>>>>>>> merge-perfschema-5.7 delete from performance_schema.setup_objects where object_schema='master'; connection slave; @@ -73,8 +122,24 @@ delete from performance_schema.setup_objects where object_schema='slave'; select * from performance_schema.setup_objects; OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME ENABLED TIMED +EVENT mysql % NO NO +EVENT performance_schema % NO NO +EVENT information_schema % NO NO +EVENT % % YES YES +FUNCTION mysql % NO NO +FUNCTION performance_schema % NO NO +FUNCTION information_schema % NO NO +FUNCTION % % YES YES +PROCEDURE mysql % NO NO +PROCEDURE performance_schema % NO NO +PROCEDURE information_schema % NO NO +PROCEDURE % % YES YES TABLE mysql % NO NO TABLE performance_schema % NO NO TABLE information_schema % NO NO TABLE % % YES YES +TRIGGER mysql % NO NO +TRIGGER performance_schema % NO NO +TRIGGER information_schema % NO NO +TRIGGER % % YES YES include/rpl_end.inc |