database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge remote-tracking branch 'upstream/10.4' into 10.5

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2021-09-10 17:16:18 +03:00
parent 6e3bd663d0 4f85eadf71
commit 7c33ecb665
189 changed files with 4443 additions and 2525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/suite/perfschema/r/dml_setup_objects.result
View File

@ -70,3 +70,15 @@ insert into performance_schema.setup_objects
select * from test.setup_objects;
drop table test.setup_objects;
SET sql_mode = default;
#
# MDEV-25325 column_comment for performance_schema tables
#
select column_name, column_comment
from information_schema.columns
where table_schema='performance_schema' and table_name='setup_objects';
column_name column_comment
OBJECT_TYPE Type of object to instrument.
OBJECT_SCHEMA Schema containing the object, either the literal or % for any schema.
OBJECT_NAME Name of the instrumented object, either the literal or % for any object.
ENABLED Whether the object's events are instrumented or not. Can be disabled, in which case monitoring is not enabled for those objects.
TIMED Whether the object's events are timed or not. Can be modified.