mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
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
This commit is contained in:
@@ -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()
|
||||
|
Reference in New Issue
Block a user