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 branch '10.2' into 10.3

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2021-09-07 16:32:35 +03:00
parent 391f6b4f1e 528abc749e
commit b85b8348e7
169 changed files with 4054 additions and 2388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite/perfschema/t/dml_accounts.test
View File

@ -39,3 +39,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.accounts WRITE;
UNLOCK TABLES;
--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='accounts';

6
mysql-test/suite/perfschema/t/dml_cond_instances.test
View File

@ -33,3 +33,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.cond_instances WRITE;
UNLOCK TABLES;
--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='cond_instances';

6
mysql-test/suite/perfschema/t/dml_esgs_by_account_by_event_name.test
View File

@ -40,3 +40,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.events_stages_summary_by_account_by_event_name WRITE;
UNLOCK TABLES;
--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='events_stages_summary_by_account_by_event_name';

6
mysql-test/suite/perfschema/t/dml_esgs_by_host_by_event_name.test
View File

@ -40,3 +40,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.events_stages_summary_by_host_by_event_name WRITE;
UNLOCK TABLES;
--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='events_stages_summary_by_host_by_event_name';

6
mysql-test/suite/perfschema/t/dml_esgs_by_thread_by_event_name.test
View File

@ -40,3 +40,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.events_stages_summary_by_thread_by_event_name WRITE;
UNLOCK TABLES;
--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='events_stages_summary_by_thread_by_event_name';

6
mysql-test/suite/perfschema/t/dml_esgs_by_user_by_event_name.test
View File

@ -40,3 +40,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.events_stages_summary_by_user_by_event_name WRITE;
UNLOCK TABLES;
--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='events_stages_summary_by_user_by_event_name';

6
mysql-test/suite/perfschema/t/dml_esgs_global_by_event_name.test
View File

@ -39,3 +39,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.events_stages_summary_global_by_event_name WRITE;
UNLOCK TABLES;
--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='events_stages_summary_global_by_event_name';

6
mysql-test/suite/perfschema/t/dml_esms_by_account_by_event_name.test
View File

@ -40,3 +40,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.events_statements_summary_by_account_by_event_name WRITE;
UNLOCK TABLES;
--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='events_statements_summary_by_account_by_event_name';

6
mysql-test/suite/perfschema/t/dml_esms_by_digest.test
View File

@ -61,3 +61,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.events_statements_summary_by_digest WRITE;
UNLOCK TABLES;
--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='events_statements_summary_by_digest';

6
mysql-test/suite/perfschema/t/dml_esms_by_host_by_event_name.test
View File

@ -40,3 +40,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.events_statements_summary_by_host_by_event_name WRITE;
UNLOCK TABLES;
--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='events_statements_summary_by_host_by_event_name';

6
mysql-test/suite/perfschema/t/dml_esms_by_thread_by_event_name.test
View File

@ -40,3 +40,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.events_statements_summary_by_thread_by_event_name WRITE;
UNLOCK TABLES;
--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='events_statements_summary_by_thread_by_event_name';

6
mysql-test/suite/perfschema/t/dml_esms_by_user_by_event_name.test
View File

@ -40,3 +40,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.events_statements_summary_by_user_by_event_name WRITE;
UNLOCK TABLES;
--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='events_statements_summary_by_user_by_event_name';

6
mysql-test/suite/perfschema/t/dml_esms_global_by_event_name.test
View File

@ -39,3 +39,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.events_statements_summary_global_by_event_name WRITE;
UNLOCK TABLES;
--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='events_statements_summary_global_by_event_name';

6
mysql-test/suite/perfschema/t/dml_events_stages_current.test
View File

@ -39,3 +39,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.events_stages_current WRITE;
UNLOCK TABLES;
--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='events_stages_current';

6
mysql-test/suite/perfschema/t/dml_events_stages_history.test
View File

@ -45,3 +45,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.events_stages_history WRITE;
UNLOCK TABLES;
--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='events_stages_history';

6
mysql-test/suite/perfschema/t/dml_events_stages_history_long.test
View File

@ -45,3 +45,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.events_stages_history_long WRITE;
UNLOCK TABLES;
--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='events_stages_history_long';

6
mysql-test/suite/perfschema/t/dml_events_statements_current.test
View File

@ -39,3 +39,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.events_statements_current WRITE;
UNLOCK TABLES;
--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='events_statements_current';

6
mysql-test/suite/perfschema/t/dml_events_statements_history.test
View File

@ -45,3 +45,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.events_statements_history WRITE;
UNLOCK TABLES;
--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='events_statements_history';

6
mysql-test/suite/perfschema/t/dml_events_statements_history_long.test
View File

@ -45,3 +45,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.events_statements_history_long WRITE;
UNLOCK TABLES;
--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='events_statements_history_long';

6
mysql-test/suite/perfschema/t/dml_events_waits_current.test
View File

@ -39,3 +39,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.events_waits_current WRITE;
UNLOCK TABLES;
--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='events_waits_current';

6
mysql-test/suite/perfschema/t/dml_events_waits_history.test
View File

@ -45,3 +45,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.events_waits_history WRITE;
UNLOCK TABLES;
--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='events_waits_history';

6
mysql-test/suite/perfschema/t/dml_events_waits_history_long.test
View File

@ -45,3 +45,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.events_waits_history_long WRITE;
UNLOCK TABLES;
--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='events_waits_history_long';

6
mysql-test/suite/perfschema/t/dml_ews_by_account_by_event_name.test
View File

@ -39,3 +39,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.events_waits_summary_by_account_by_event_name WRITE;
UNLOCK TABLES;
--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='events_waits_summary_by_account_by_event_name';

6
mysql-test/suite/perfschema/t/dml_ews_by_host_by_event_name.test
View File

@ -39,3 +39,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.events_waits_summary_by_host_by_event_name WRITE;
UNLOCK TABLES;
--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='events_waits_summary_by_host_by_event_name';

6
mysql-test/suite/perfschema/t/dml_ews_by_instance.test
View File

@ -52,3 +52,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.events_waits_summary_by_instance WRITE;
UNLOCK TABLES;
--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='events_waits_summary_by_instance';

6
mysql-test/suite/perfschema/t/dml_ews_by_thread_by_event_name.test
View File

@ -40,3 +40,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.events_waits_summary_by_thread_by_event_name WRITE;
UNLOCK TABLES;
--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='events_waits_summary_by_thread_by_event_name';

6
mysql-test/suite/perfschema/t/dml_ews_by_user_by_event_name.test
View File

@ -39,3 +39,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.events_waits_summary_by_user_by_event_name WRITE;
UNLOCK TABLES;
--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='events_waits_summary_by_user_by_event_name';

6
mysql-test/suite/perfschema/t/dml_ews_global_by_event_name.test
View File

@ -39,3 +39,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.events_waits_summary_global_by_event_name WRITE;
UNLOCK TABLES;
--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='events_waits_summary_global_by_event_name';

8
mysql-test/suite/perfschema/t/dml_file_instances.test
View File

@ -33,3 +33,11 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.file_instances WRITE;
UNLOCK TABLES;
--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='file_instances';

6
mysql-test/suite/perfschema/t/dml_fs_by_event_name.test
View File

@ -39,3 +39,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.file_summary_by_event_name WRITE;
UNLOCK TABLES;
--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='file_summary_by_event_name';

6
mysql-test/suite/perfschema/t/dml_fs_by_instance.test
View File

@ -39,3 +39,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.file_summary_by_instance WRITE;
UNLOCK TABLES;
--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='file_summary_by_instance';

6
mysql-test/suite/perfschema/t/dml_host_cache.test
View File

@ -41,3 +41,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.host_cache WRITE;
UNLOCK TABLES;
--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='host_cache';

6
mysql-test/suite/perfschema/t/dml_hosts.test
View File

@ -39,3 +39,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.hosts WRITE;
UNLOCK TABLES;
--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='hosts';

6
mysql-test/suite/perfschema/t/dml_mutex_instances.test
View File

@ -33,3 +33,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.mutex_instances WRITE;
UNLOCK TABLES;
--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='mutex_instances';

6
mysql-test/suite/perfschema/t/dml_os_global_by_type.test
View File

@ -55,3 +55,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.objects_summary_global_by_type WRITE;
UNLOCK TABLES;
--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='objects_summary_global_by_type';

6
mysql-test/suite/perfschema/t/dml_performance_timers.test
View File

@ -35,3 +35,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.performance_timers WRITE;
UNLOCK TABLES;
--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='performance_timers';

6
mysql-test/suite/perfschema/t/dml_rwlock_instances.test
View File

@ -33,3 +33,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.rwlock_instances WRITE;
UNLOCK TABLES;
--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='rwlock_instances';

9
mysql-test/suite/perfschema/t/dml_session_account_connect_attrs.test
View File

@ -1,3 +1,5 @@
# Tests for PERFORMANCE_SCHEMA
--source include/not_embedded.inc
--source include/have_perfschema.inc
@ -36,3 +38,10 @@ UNLOCK TABLES;
-- error ER_TABLEACCESS_DENIED_ERROR
LOCK TABLES performance_schema.session_account_connect_attrs WRITE;
UNLOCK TABLES;
--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='session_account_connect_attrs';

9
mysql-test/suite/perfschema/t/dml_session_connect_attrs.test
View File

@ -1,3 +1,5 @@
# Tests for PERFORMANCE_SCHEMA
--source include/not_embedded.inc
--source include/have_perfschema.inc
@ -36,3 +38,10 @@ UNLOCK TABLES;
-- error ER_TABLEACCESS_DENIED_ERROR
LOCK TABLES performance_schema.session_connect_attrs WRITE;
UNLOCK TABLES;
--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='session_connect_attrs';

6
mysql-test/suite/perfschema/t/dml_setup_actors.test
View File

@ -70,3 +70,9 @@ insert into performance_schema.setup_actors
select * from test.setup_actors;
drop table test.setup_actors;
--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_actors';

6
mysql-test/suite/perfschema/t/dml_setup_consumers.test
View File

@ -38,3 +38,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.setup_consumers WRITE;
UNLOCK TABLES;
--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_consumers';

7
mysql-test/suite/perfschema/t/dml_setup_instruments.test
View File

@ -98,3 +98,10 @@ ORDER BY RAND();
update performance_schema.setup_instruments set timed='YES';
--enable_query_log
--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_instruments';

6
mysql-test/suite/perfschema/t/dml_setup_objects.test
View File

@ -94,3 +94,9 @@ insert into performance_schema.setup_objects
select * from test.setup_objects;
drop table test.setup_objects;
--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';

6
mysql-test/suite/perfschema/t/dml_setup_timers.test
View File

@ -64,3 +64,9 @@ update performance_schema.setup_timers
select * from performance_schema.setup_timers;
--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_timers';

6
mysql-test/suite/perfschema/t/dml_socket_instances.test
View File

@ -33,3 +33,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.socket_instances WRITE;
UNLOCK TABLES;
--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='socket_instances';

6
mysql-test/suite/perfschema/t/dml_socket_summary_by_event_name.test
View File

@ -40,3 +40,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.socket_summary_by_event_name WRITE;
UNLOCK TABLES;
--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='socket_summary_by_event_name';

6
mysql-test/suite/perfschema/t/dml_socket_summary_by_instance.test
View File

@ -40,3 +40,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.socket_summary_by_instance WRITE;
UNLOCK TABLES;
--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='socket_summary_by_instance';

6
mysql-test/suite/perfschema/t/dml_threads.test
View File

@ -48,3 +48,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.threads WRITE;
UNLOCK TABLES;
--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='threads';

6
mysql-test/suite/perfschema/t/dml_tiws_by_index_usage.test
View File

@ -40,3 +40,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.table_io_waits_summary_by_index_usage WRITE;
UNLOCK TABLES;
--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='table_io_waits_summary_by_index_usage';

6
mysql-test/suite/perfschema/t/dml_tiws_by_table.test
View File

@ -40,3 +40,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.table_io_waits_summary_by_table WRITE;
UNLOCK TABLES;
--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='table_io_waits_summary_by_table';

6
mysql-test/suite/perfschema/t/dml_tlws_by_table.test
View File

@ -40,3 +40,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.table_lock_waits_summary_by_table WRITE;
UNLOCK TABLES;
--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='table_lock_waits_summary_by_table';

6
mysql-test/suite/perfschema/t/dml_users.test
View File

@ -39,3 +39,9 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.users WRITE;
UNLOCK TABLES;
--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='users';

5
mysql-test/suite/perfschema/t/table_schema.test
View File

@ -55,3 +55,8 @@ select count(*) from information_schema.columns
select (@count_object_columns - @count_object_unsigned) = 0;
# Confirm that all columns have comments
#
select count(*) from information_schema.columns
where table_schema="performance_schema"
and (column_comment is null or column_comment = '');