diff options
Diffstat (limited to 'mysql-test/suite/perfschema/r/connect_attrs.result')
| -rw-r--r-- | mysql-test/suite/perfschema/r/connect_attrs.result | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mysql-test/suite/perfschema/r/connect_attrs.result b/mysql-test/suite/perfschema/r/connect_attrs.result index 5e45a4cd900..1ed8e16b6ca 100644 --- a/mysql-test/suite/perfschema/r/connect_attrs.result +++ b/mysql-test/suite/perfschema/r/connect_attrs.result @@ -37,10 +37,15 @@ SELECT COUNT(DISTINCT PROCESSLIST_ID) FROM performance_schema.session_connect_attrs; COUNT(DISTINCT PROCESSLIST_ID) 2 +<<<<<<< HEAD connection non_privileged_user; +======= +# must return 1 +>>>>>>> merge-perfschema-5.7 SELECT COUNT(DISTINCT PROCESSLIST_ID) FROM performance_schema.session_account_connect_attrs; -ERROR 42000: SELECT command denied to user 'wl5924'@'localhost' for table 'session_account_connect_attrs' +COUNT(DISTINCT PROCESSLIST_ID) +1 SELECT COUNT(DISTINCT PROCESSLIST_ID) FROM performance_schema.session_connect_attrs; ERROR 42000: SELECT command denied to user 'wl5924'@'localhost' for table 'session_connect_attrs' |