summaryrefslogtreecommitdiff
path: root/storage/perfschema/table_threads.cc
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2014-08-19 15:18:18 +0400
committerSergey Vojtovich <svoj@mariadb.org>2014-08-19 15:18:18 +0400
commitf1c1c04a34f39bcd6622b9886fb089dd41e51103 (patch)
tree1d884e3eb98ff172cf6d399df99ce1e7f9480e73 /storage/perfschema/table_threads.cc
parente7669cf6070567646c190fc87746a86e43da27c2 (diff)
downloadmariadb-git-f1c1c04a34f39bcd6622b9886fb089dd41e51103.tar.gz
MDEV-4262 - P_S discovery
Discover P_S tables automatically. Most of this patch is code clean-up: - removed tests and code responsible for P_S tables correctness verification - always return error from ha_perfschema::create() - install/upgrade scripts won't create P_S tables anymore
Diffstat (limited to 'storage/perfschema/table_threads.cc')
-rw-r--r--storage/perfschema/table_threads.cc95
1 files changed, 15 insertions, 80 deletions
diff --git a/storage/perfschema/table_threads.cc b/storage/perfschema/table_threads.cc
index 1fd2486589c..5c78b567b8c 100644
--- a/storage/perfschema/table_threads.cc
+++ b/storage/perfschema/table_threads.cc
@@ -22,84 +22,6 @@
THR_LOCK table_threads::m_table_lock;
-static const TABLE_FIELD_TYPE field_types[]=
-{
- {
- { C_STRING_WITH_LEN("THREAD_ID") },
- { C_STRING_WITH_LEN("bigint(20)") },
- { NULL, 0}
- },
- {
- { C_STRING_WITH_LEN("NAME") },
- { C_STRING_WITH_LEN("varchar(128)") },
- { NULL, 0}
- },
- {
- { C_STRING_WITH_LEN("TYPE") },
- { C_STRING_WITH_LEN("varchar(10)") },
- { NULL, 0}
- },
- {
- { C_STRING_WITH_LEN("PROCESSLIST_ID") },
- { C_STRING_WITH_LEN("bigint(20)") },
- { NULL, 0}
- },
- {
- { C_STRING_WITH_LEN("PROCESSLIST_USER") },
- { C_STRING_WITH_LEN("varchar(16)") },
- { NULL, 0}
- },
- {
- { C_STRING_WITH_LEN("PROCESSLIST_HOST") },
- { C_STRING_WITH_LEN("varchar(60)") },
- { NULL, 0}
- },
- {
- { C_STRING_WITH_LEN("PROCESSLIST_DB") },
- { C_STRING_WITH_LEN("varchar(64)") },
- { NULL, 0}
- },
- {
- { C_STRING_WITH_LEN("PROCESSLIST_COMMAND") },
- { C_STRING_WITH_LEN("varchar(16)") },
- { NULL, 0}
- },
- {
- { C_STRING_WITH_LEN("PROCESSLIST_TIME") },
- { C_STRING_WITH_LEN("bigint(20)") },
- { NULL, 0}
- },
- {
- { C_STRING_WITH_LEN("PROCESSLIST_STATE") },
- { C_STRING_WITH_LEN("varchar(64)") },
- { NULL, 0}
- },
- {
- { C_STRING_WITH_LEN("PROCESSLIST_INFO") },
- { C_STRING_WITH_LEN("longtext") },
- { NULL, 0}
- },
- {
- { C_STRING_WITH_LEN("PARENT_THREAD_ID") },
- { C_STRING_WITH_LEN("bigint(20)") },
- { NULL, 0}
- },
- {
- { C_STRING_WITH_LEN("ROLE") },
- { C_STRING_WITH_LEN("varchar(64)") },
- { NULL, 0}
- },
- {
- { C_STRING_WITH_LEN("INSTRUMENTED") },
- { C_STRING_WITH_LEN("enum(\'YES\',\'NO\')") },
- { NULL, 0}
- }
-};
-
-TABLE_FIELD_DEF
-table_threads::m_field_def=
-{ 14, field_types, 0, (uint*) 0 };
-
PFS_engine_table_share
table_threads::m_share=
{
@@ -112,8 +34,21 @@ table_threads::m_share=
1000, /* records */
sizeof(PFS_simple_index), /* ref length */
&m_table_lock,
- &m_field_def,
- false /* checked */
+ { C_STRING_WITH_LEN("CREATE TABLE threads("
+ "THREAD_ID BIGINT unsigned not null,"
+ "NAME VARCHAR(128) not null,"
+ "TYPE VARCHAR(10) not null,"
+ "PROCESSLIST_ID BIGINT unsigned,"
+ "PROCESSLIST_USER VARCHAR(16),"
+ "PROCESSLIST_HOST VARCHAR(60),"
+ "PROCESSLIST_DB VARCHAR(64),"
+ "PROCESSLIST_COMMAND VARCHAR(16),"
+ "PROCESSLIST_TIME BIGINT,"
+ "PROCESSLIST_STATE VARCHAR(64),"
+ "PROCESSLIST_INFO LONGTEXT,"
+ "PARENT_THREAD_ID BIGINT unsigned,"
+ "ROLE VARCHAR(64),"
+ "INSTRUMENTED ENUM ('YES', 'NO') not null)") }
};
PFS_engine_table* table_threads::create()