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

4
mysql-test/suite/perfschema/r/dml_setup_actors.result
View File

@@ -42,10 +42,7 @@ set host='ILLEGAL';
ERROR HY000: Invalid performance_schema usage
update performance_schema.setup_actors
set role='ILLEGAL';
<<<<<<< HEAD
ERROR HY000: Invalid performance_schema usage
=======
ERROR HY000: Invalid performance_schema usage.
update performance_schema.setup_actors
set ENABLED='YES';
update performance_schema.setup_actors
@@ -71,7 +68,6 @@ ERROR 01000: Data truncated for column 'HISTORY' at row 1
update performance_schema.setup_actors
set HISTORY=NULL;
ERROR 23000: Column 'HISTORY' cannot be null
>>>>>>> 258e16fa2de... WIP 5.7 P_S
select * from performance_schema.setup_actors
order by USER, HOST;
HOST USER ROLE ENABLED HISTORY