database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-4262 - P_S discovery

Browse Source 
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:
Sergey Vojtovich
2014-08-19 15:18:18 +04:00
parent e7669cf607
commit f1c1c04a34
107 changed files with 889 additions and 6317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
storage/perfschema/table_socket_instances.cc
View File

@@ -28,49 +28,6 @@
THR_LOCK table_socket_instances::m_table_lock;
static const TABLE_FIELD_TYPE field_types[]=
{
{
{ C_STRING_WITH_LEN("EVENT_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("THREAD_ID") },
{ C_STRING_WITH_LEN("bigint(20)") },
{ NULL, 0}
},
{
{ C_STRING_WITH_LEN("SOCKET_ID") },
{ C_STRING_WITH_LEN("int(11)") },
{ NULL, 0}
},
{
{ C_STRING_WITH_LEN("IP") },
{ C_STRING_WITH_LEN("varchar(64)") },
{ NULL, 0}
},
{
{ C_STRING_WITH_LEN("PORT") },
{ C_STRING_WITH_LEN("int(11)") },
{ NULL, 0}
},
{
{ C_STRING_WITH_LEN("STATE") },
{ C_STRING_WITH_LEN("enum('IDLE','ACTIVE')") },
{ NULL, 0}
}
};
TABLE_FIELD_DEF
table_socket_instances::m_field_def=
{ 7, field_types, 0, (uint*) 0 };
PFS_engine_table_share
table_socket_instances::m_share=
{
@@ -83,8 +40,14 @@ table_socket_instances::m_share=
1000, /* records */
sizeof(PFS_simple_index),
&m_table_lock,
&m_field_def,
false /* checked */
{ C_STRING_WITH_LEN("CREATE TABLE socket_instances("
"EVENT_NAME VARCHAR(128) not null,"
"OBJECT_INSTANCE_BEGIN BIGINT unsigned not null,"
"THREAD_ID BIGINT unsigned,"
"SOCKET_ID INTEGER not null,"
"IP VARCHAR(64) not null,"
"PORT INTEGER not null,"
"STATE ENUM('IDLE','ACTIVE') not null)") }
};
PFS_engine_table* table_socket_instances::create(void)