diff options
author | Vicențiu Ciorbaru <cvicentiu@gmail.com> | 2021-09-07 16:32:35 +0300 |
---|---|---|
committer | Vicențiu Ciorbaru <cvicentiu@gmail.com> | 2021-09-07 16:32:35 +0300 |
commit | b85b8348e761e38dcc2d49d171b7e28c32397374 (patch) | |
tree | 03d22c6ea95877ab0d833292cc791a5a2dd0eac9 /mysql-test/suite/perfschema/r/dml_rwlock_instances.result | |
parent | 391f6b4f1ebe4dccfaf0181257aa46edb6253015 (diff) | |
parent | 528abc749e8a65674dd10f59a2d99d7841709939 (diff) | |
download | mariadb-git-b85b8348e761e38dcc2d49d171b7e28c32397374.tar.gz |
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/suite/perfschema/r/dml_rwlock_instances.result')
-rw-r--r-- | mysql-test/suite/perfschema/r/dml_rwlock_instances.result | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/suite/perfschema/r/dml_rwlock_instances.result b/mysql-test/suite/perfschema/r/dml_rwlock_instances.result index e127ace2dfe..4ffe125dfd7 100644 --- a/mysql-test/suite/perfschema/r/dml_rwlock_instances.result +++ b/mysql-test/suite/perfschema/r/dml_rwlock_instances.result @@ -18,3 +18,14 @@ UNLOCK TABLES; LOCK TABLES performance_schema.rwlock_instances WRITE; ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'rwlock_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='rwlock_instances'; +column_name column_comment +NAME Instrument name associated with the read write lock +OBJECT_INSTANCE_BEGIN Address in memory of the instrumented lock +WRITE_LOCKED_BY_THREAD_ID THREAD_ID of the locking thread if locked in write (exclusive) mode, otherwise NULL. +READ_LOCKED_BY_COUNT Count of current read locks held |