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

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

This commit is contained in:
Vicențiu Ciorbaru
2021-09-10 17:16:18 +03:00
189 changed files with 4443 additions and 2525 deletions

View File

@ -18,6 +18,16 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.file_instances WRITE;
ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'file_instances'
UNLOCK TABLES;
#
# 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='file_instances';
column_name column_comment
FILE_NAME File name.
EVENT_NAME Instrument name associated with the file.
OPEN_COUNT Open handles on the file. A value of greater than zero means that the file is currently open.
###
### Bug#26152751: INNODB LEAKS MEMORY, PERFORMANCE_SCHEMA FILE_INSTANCES
### #SQL-IB3129987-252773.IBD