database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

perfschema compilation, test and misc fixes

Browse Source
This commit is contained in:
Sergei Golubchik
2020-02-15 18:25:57 +01:00
parent 81cffda2e6
commit 7af733a5a2
403 changed files with 20147 additions and 63173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/perfschema/r/connect_attrs.result
View File

@@ -37,11 +37,8 @@ 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;
COUNT(DISTINCT PROCESSLIST_ID)