summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2020-09-18 12:13:40 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2020-09-18 12:13:48 +0200
commit25eacc023b2e77c740ab595554e934db00c49faa (patch)
tree804f85b6134d52c74295e85e5fddb407b968c3f1
parent46fab5b32a84a1ffd181dd16b5cd63958faf010b (diff)
downloadmariadb-git-bb-10.6-MDEV-16440.tar.gz
-rw-r--r--mysql-test/suite/perfschema/disabled.def4
-rw-r--r--storage/perfschema/CMakeLists.txt4
-rw-r--r--storage/perfschema/pfs_engine_table.cc4
3 files changed, 4 insertions, 8 deletions
diff --git a/mysql-test/suite/perfschema/disabled.def b/mysql-test/suite/perfschema/disabled.def
index 9c36708729a..2dc05e2ab85 100644
--- a/mysql-test/suite/perfschema/disabled.def
+++ b/mysql-test/suite/perfschema/disabled.def
@@ -43,11 +43,7 @@ replication_group_member_stats: todo?
rpl_group_member_stats: todo?
rpl_group_members: todo?
-ddl_session_variables: todo
-ddl_global_variables: todo
ddl_variables_by_thread: todo
-dml_global_variables: todo
-dml_session_variables: todo
dml_variables_by_thread: todo
variables_by_thread: todo
show_coverage: todo
diff --git a/storage/perfschema/CMakeLists.txt b/storage/perfschema/CMakeLists.txt
index c871677d0a9..b8bd033e5b4 100644
--- a/storage/perfschema/CMakeLists.txt
+++ b/storage/perfschema/CMakeLists.txt
@@ -252,8 +252,8 @@ table_status_by_user.cc
table_global_status.cc
table_session_status.cc
#table_variables_by_thread.cc
-#table_global_variables.cc
-#table_session_variables.cc
+table_global_variables.cc
+table_session_variables.cc
table_table_handles.cc
table_threads.cc
table_tiws_by_index_usage.cc
diff --git a/storage/perfschema/pfs_engine_table.cc b/storage/perfschema/pfs_engine_table.cc
index b9f79fa61d6..9a71877a6f3 100644
--- a/storage/perfschema/pfs_engine_table.cc
+++ b/storage/perfschema/pfs_engine_table.cc
@@ -332,8 +332,8 @@ static PFS_engine_table_share *all_shares[]=
&table_session_status::m_share,
//&table_variables_by_thread::m_share,
- //&table_global_variables::m_share,
- //&table_session_variables::m_share,
+ &table_global_variables::m_share,
+ &table_session_variables::m_share,
NULL
};