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

@ -94,3 +94,9 @@ insert into performance_schema.setup_objects
select * from test.setup_objects;
drop table test.setup_objects;
SET sql_mode = default;
--echo #
--echo # MDEV-25325 column_comment for performance_schema tables
--echo #
select column_name, column_comment
from information_schema.columns
where table_schema='performance_schema' and table_name='setup_objects';