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:
@@ -29,29 +29,6 @@
|
||||
|
||||
THR_LOCK table_mutex_instances::m_table_lock;
|
||||
|
||||
static const TABLE_FIELD_TYPE mutex_field_types[]=
|
||||
{
|
||||
{
|
||||
{ C_STRING_WITH_LEN("NAME") },
|
||||
{ C_STRING_WITH_LEN("varchar(128)") },
|
||||
{ NULL, 0}
|
||||
},
|
||||
{
|
||||
{ C_STRING_WITH_LEN("OBJECT_INSTANCE_BEGIN") },
|
||||
{ C_STRING_WITH_LEN("bigint(20)") },
|
||||
{ NULL, 0}
|
||||
},
|
||||
{
|
||||
{ C_STRING_WITH_LEN("LOCKED_BY_THREAD_ID") },
|
||||
{ C_STRING_WITH_LEN("bigint(20)") },
|
||||
{ NULL, 0}
|
||||
}
|
||||
};
|
||||
|
||||
TABLE_FIELD_DEF
|
||||
table_mutex_instances::m_field_def=
|
||||
{ 3, mutex_field_types, 0, (uint*) 0 };
|
||||
|
||||
PFS_engine_table_share
|
||||
table_mutex_instances::m_share=
|
||||
{
|
||||
@@ -64,8 +41,10 @@ table_mutex_instances::m_share=
|
||||
1000, /* records */
|
||||
sizeof(PFS_simple_index),
|
||||
&m_table_lock,
|
||||
&m_field_def,
|
||||
false /* checked */
|
||||
{ C_STRING_WITH_LEN("CREATE TABLE mutex_instances("
|
||||
"NAME VARCHAR(128) not null,"
|
||||
"OBJECT_INSTANCE_BEGIN BIGINT unsigned not null,"
|
||||
"LOCKED_BY_THREAD_ID BIGINT unsigned)") }
|
||||
};
|
||||
|
||||
PFS_engine_table* table_mutex_instances::create(void)
|
||||
@@ -193,34 +172,6 @@ int table_mutex_instances::read_row_values(TABLE *table,
|
||||
|
||||
THR_LOCK table_rwlock_instances::m_table_lock;
|
||||
|
||||
static const TABLE_FIELD_TYPE rwlock_field_types[]=
|
||||
{
|
||||
{
|
||||
{ C_STRING_WITH_LEN("NAME") },
|
||||
{ C_STRING_WITH_LEN("varchar(128)") },
|
||||
{ NULL, 0}
|
||||
},
|
||||
{
|
||||
{ C_STRING_WITH_LEN("OBJECT_INSTANCE_BEGIN") },
|
||||
{ C_STRING_WITH_LEN("bigint(20)") },
|
||||
{ NULL, 0}
|
||||
},
|
||||
{
|
||||
{ C_STRING_WITH_LEN("WRITE_LOCKED_BY_THREAD_ID") },
|
||||
{ C_STRING_WITH_LEN("bigint(20)") },
|
||||
{ NULL, 0}
|
||||
},
|
||||
{
|
||||
{ C_STRING_WITH_LEN("READ_LOCKED_BY_COUNT") },
|
||||
{ C_STRING_WITH_LEN("int(10)") },
|
||||
{ NULL, 0}
|
||||
}
|
||||
};
|
||||
|
||||
TABLE_FIELD_DEF
|
||||
table_rwlock_instances::m_field_def=
|
||||
{ 4, rwlock_field_types, 0, (uint*) 0 };
|
||||
|
||||
PFS_engine_table_share
|
||||
table_rwlock_instances::m_share=
|
||||
{
|
||||
@@ -233,8 +184,11 @@ table_rwlock_instances::m_share=
|
||||
1000, /* records */
|
||||
sizeof(PFS_simple_index),
|
||||
&m_table_lock,
|
||||
&m_field_def,
|
||||
false /* checked */
|
||||
{ C_STRING_WITH_LEN("CREATE TABLE rwlock_instances("
|
||||
"NAME VARCHAR(128) not null,"
|
||||
"OBJECT_INSTANCE_BEGIN BIGINT unsigned not null,"
|
||||
"WRITE_LOCKED_BY_THREAD_ID BIGINT unsigned,"
|
||||
"READ_LOCKED_BY_COUNT INTEGER unsigned not null)") }
|
||||
};
|
||||
|
||||
PFS_engine_table* table_rwlock_instances::create(void)
|
||||
@@ -369,24 +323,6 @@ int table_rwlock_instances::read_row_values(TABLE *table,
|
||||
|
||||
THR_LOCK table_cond_instances::m_table_lock;
|
||||
|
||||
static const TABLE_FIELD_TYPE cond_field_types[]=
|
||||
{
|
||||
{
|
||||
{ C_STRING_WITH_LEN("NAME") },
|
||||
{ C_STRING_WITH_LEN("varchar(128)") },
|
||||
{ NULL, 0}
|
||||
},
|
||||
{
|
||||
{ C_STRING_WITH_LEN("OBJECT_INSTANCE_BEGIN") },
|
||||
{ C_STRING_WITH_LEN("bigint(20)") },
|
||||
{ NULL, 0}
|
||||
}
|
||||
};
|
||||
|
||||
TABLE_FIELD_DEF
|
||||
table_cond_instances::m_field_def=
|
||||
{ 2, cond_field_types, 0, (uint*) 0 };
|
||||
|
||||
PFS_engine_table_share
|
||||
table_cond_instances::m_share=
|
||||
{
|
||||
@@ -399,8 +335,9 @@ table_cond_instances::m_share=
|
||||
1000, /* records */
|
||||
sizeof(PFS_simple_index),
|
||||
&m_table_lock,
|
||||
&m_field_def,
|
||||
false /* checked */
|
||||
{ C_STRING_WITH_LEN("CREATE TABLE cond_instances("
|
||||
"NAME VARCHAR(128) not null,"
|
||||
"OBJECT_INSTANCE_BEGIN BIGINT unsigned not null)") }
|
||||
};
|
||||
|
||||
PFS_engine_table* table_cond_instances::create(void)
|
||||
|
Reference in New Issue
Block a user