diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-12-10 15:35:00 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-03-10 19:24:22 +0100 |
| commit | 0ea717f51a152afdb3791195c4a25ee0baa2faac (patch) | |
| tree | 0eb10fc1413d1583ffdec2c18a66491d7befeec2 /mysql-test/suite/perfschema/r/start_server_no_digests.result | |
| parent | dfe6e914e58472159f34a8a4c9288ff61eac479f (diff) | |
| download | mariadb-git-0ea717f51a152afdb3791195c4a25ee0baa2faac.tar.gz | |
P_S 5.7.28
Diffstat (limited to 'mysql-test/suite/perfschema/r/start_server_no_digests.result')
| -rw-r--r-- | mysql-test/suite/perfschema/r/start_server_no_digests.result | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/suite/perfschema/r/start_server_no_digests.result b/mysql-test/suite/perfschema/r/start_server_no_digests.result index f8301e62a7f..7194b4a6e01 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_digests.result +++ b/mysql-test/suite/perfschema/r/start_server_no_digests.result @@ -111,8 +111,13 @@ DROP TRIGGER trg; #################################### SELECT SCHEMA_NAME, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS, SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest; +<<<<<<< HEAD SCHEMA_NAME DIGEST_TEXT COUNT_STAR SUM_ROWS_AFFECTED SUM_WARNINGS SUM_ERRORS SHOW VARIABLES LIKE "performance_schema_digests_size"; +======= +SCHEMA_NAME DIGEST DIGEST_TEXT COUNT_STAR SUM_ROWS_AFFECTED SUM_WARNINGS SUM_ERRORS +SHOW GLOBAL VARIABLES LIKE "performance_schema_digests_size"; +>>>>>>> merge-perfschema-5.7 Variable_name Value performance_schema_digests_size 0 SELECT COUNT(*) FROM performance_schema.events_statements_summary_by_digest; |