Skip to content

M
mariadb
Commit c2da54ef authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

simplify future xtradb merges (hopefully)

parent e47cdfdf
Hide whitespace changes
Inline Side-by-side
Showing with 983 additions and 468 deletions
storage/xtradb/handler/ha_innodb.cc
View file @ c2da54ef
...@@ -13155,29 +13155,29 @@ maria_declare_plugin(xtradb) ...@@ -13155,29 +13155,29 @@ maria_declare_plugin(xtradb)
INNODB_VERSION_STR, /* string version */ INNODB_VERSION_STR, /* string version */
MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ MariaDB_PLUGIN_MATURITY_STABLE /* maturity */
}, },
i_s_innodb_rseg_maria, i_s_innodb_rseg,
i_s_innodb_undo_logs_maria, i_s_innodb_undo_logs,
i_s_innodb_trx_maria, i_s_innodb_trx,
i_s_innodb_locks_maria, i_s_innodb_locks,
i_s_innodb_lock_waits_maria, i_s_innodb_lock_waits,
i_s_innodb_cmp_maria, i_s_innodb_cmp,
i_s_innodb_cmp_reset_maria, i_s_innodb_cmp_reset,
i_s_innodb_cmpmem_maria, i_s_innodb_cmpmem,
i_s_innodb_cmpmem_reset_maria, i_s_innodb_cmpmem_reset,
i_s_innodb_sys_tables_maria, i_s_innodb_sys_tables,
i_s_innodb_sys_tablestats_maria, i_s_innodb_sys_tablestats,
i_s_innodb_sys_indexes_maria, i_s_innodb_sys_indexes,
i_s_innodb_sys_columns_maria, i_s_innodb_sys_columns,
i_s_innodb_sys_fields_maria, i_s_innodb_sys_fields,
i_s_innodb_sys_foreign_maria, i_s_innodb_sys_foreign,
i_s_innodb_sys_foreign_cols_maria, i_s_innodb_sys_foreign_cols,
i_s_innodb_sys_stats_maria, i_s_innodb_sys_stats,
i_s_innodb_table_stats_maria, i_s_innodb_table_stats,
i_s_innodb_index_stats_maria, i_s_innodb_index_stats,
i_s_innodb_buffer_pool_pages_maria, i_s_innodb_buffer_pool_pages,
i_s_innodb_buffer_pool_pages_index_maria, i_s_innodb_buffer_pool_pages_index,
i_s_innodb_buffer_pool_pages_blob_maria, i_s_innodb_buffer_pool_pages_blob,
i_s_innodb_admin_command_maria i_s_innodb_admin_command
maria_declare_plugin_end; maria_declare_plugin_end;
......
storage/xtradb/handler/i_s.cc
View file @ c2da54ef
...@@ -601,7 +601,52 @@ static struct st_mysql_information_schema i_s_info = ...@@ -601,7 +601,52 @@ static struct st_mysql_information_schema i_s_info =
MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION
}; };
UNIV_INTERN struct st_maria_plugin i_s_innodb_trx =
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
/* pointer to type-specific plugin descriptor */
/* void* */
STRUCT_FLD(info, &i_s_info),
/* plugin name */
/* const char* */
STRUCT_FLD(name, "INNODB_TRX"),
/* plugin author (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(author, plugin_author),
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(descr, "InnoDB transactions"),
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
STRUCT_FLD(init, innodb_trx_init),
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
STRUCT_FLD(deinit, i_s_common_deinit),
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
STRUCT_FLD(version, INNODB_VERSION_SHORT),
/* struct st_mysql_show_var* */
STRUCT_FLD(status_vars, NULL),
/* struct st_mysql_sys_var** */
STRUCT_FLD(system_vars, NULL),
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_locks */ /* Fields of the dynamic table INFORMATION_SCHEMA.innodb_locks */
static ST_FIELD_INFO innodb_locks_fields_info[] = static ST_FIELD_INFO innodb_locks_fields_info[] =
...@@ -820,6 +865,52 @@ innodb_locks_init( ...@@ -820,6 +865,52 @@ innodb_locks_init(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
UNIV_INTERN struct st_maria_plugin i_s_innodb_locks =
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
/* pointer to type-specific plugin descriptor */
/* void* */
STRUCT_FLD(info, &i_s_info),
/* plugin name */
/* const char* */
STRUCT_FLD(name, "INNODB_LOCKS"),
/* plugin author (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(author, plugin_author),
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(descr, "InnoDB conflicting locks"),
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
STRUCT_FLD(init, innodb_locks_init),
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
STRUCT_FLD(deinit, i_s_common_deinit),
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
STRUCT_FLD(version, INNODB_VERSION_SHORT),
/* struct st_mysql_show_var* */
STRUCT_FLD(status_vars, NULL),
/* struct st_mysql_sys_var** */
STRUCT_FLD(system_vars, NULL),
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_lock_waits */ /* Fields of the dynamic table INFORMATION_SCHEMA.innodb_lock_waits */
static ST_FIELD_INFO innodb_lock_waits_fields_info[] = static ST_FIELD_INFO innodb_lock_waits_fields_info[] =
...@@ -955,6 +1046,52 @@ innodb_lock_waits_init( ...@@ -955,6 +1046,52 @@ innodb_lock_waits_init(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
UNIV_INTERN struct st_maria_plugin i_s_innodb_lock_waits =
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
/* pointer to type-specific plugin descriptor */
/* void* */
STRUCT_FLD(info, &i_s_info),
/* plugin name */
/* const char* */
STRUCT_FLD(name, "INNODB_LOCK_WAITS"),
/* plugin author (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(author, plugin_author),
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(descr, "InnoDB which lock is blocking which"),
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
STRUCT_FLD(init, innodb_lock_waits_init),
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
STRUCT_FLD(deinit, i_s_common_deinit),
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
STRUCT_FLD(version, INNODB_VERSION_SHORT),
/* struct st_mysql_show_var* */
STRUCT_FLD(status_vars, NULL),
/* struct st_mysql_sys_var** */
STRUCT_FLD(system_vars, NULL),
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
/*******************************************************************//** /*******************************************************************//**
Common function to fill any of the dynamic tables: Common function to fill any of the dynamic tables:
...@@ -1240,7 +1377,100 @@ i_s_cmp_reset_init( ...@@ -1240,7 +1377,100 @@ i_s_cmp_reset_init(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
UNIV_INTERN struct st_maria_plugin i_s_innodb_cmp =
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
/* pointer to type-specific plugin descriptor */
/* void* */
STRUCT_FLD(info, &i_s_info),
/* plugin name */
/* const char* */
STRUCT_FLD(name, "INNODB_CMP"),
/* plugin author (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(author, plugin_author),
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(descr, "Statistics for the InnoDB compression"),
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
STRUCT_FLD(init, i_s_cmp_init),
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
STRUCT_FLD(deinit, i_s_common_deinit),
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
STRUCT_FLD(version, INNODB_VERSION_SHORT),
/* struct st_mysql_show_var* */
STRUCT_FLD(status_vars, NULL),
/* struct st_mysql_sys_var** */
STRUCT_FLD(system_vars, NULL),
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
UNIV_INTERN struct st_maria_plugin i_s_innodb_cmp_reset =
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
/* pointer to type-specific plugin descriptor */
/* void* */
STRUCT_FLD(info, &i_s_info),
/* plugin name */
/* const char* */
STRUCT_FLD(name, "INNODB_CMP_RESET"),
/* plugin author (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(author, plugin_author),
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(descr, "Statistics for the InnoDB compression;"
" reset cumulated counts"),
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
STRUCT_FLD(init, i_s_cmp_reset_init),
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
STRUCT_FLD(deinit, i_s_common_deinit),
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
STRUCT_FLD(version, INNODB_VERSION_SHORT),
/* struct st_mysql_show_var* */
STRUCT_FLD(status_vars, NULL),
/* struct st_mysql_sys_var** */
STRUCT_FLD(system_vars, NULL),
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
/* Fields of the dynamic table information_schema.innodb_cmpmem. */ /* Fields of the dynamic table information_schema.innodb_cmpmem. */
static ST_FIELD_INFO i_s_cmpmem_fields_info[] = static ST_FIELD_INFO i_s_cmpmem_fields_info[] =
...@@ -1436,8 +1666,100 @@ i_s_cmpmem_reset_init( ...@@ -1436,8 +1666,100 @@ i_s_cmpmem_reset_init(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
UNIV_INTERN struct st_maria_plugin i_s_innodb_cmpmem =
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
/* pointer to type-specific plugin descriptor */
/* void* */
STRUCT_FLD(info, &i_s_info),
/* plugin name */
/* const char* */
STRUCT_FLD(name, "INNODB_CMPMEM"),
/* plugin author (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(author, plugin_author),
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(descr, "Statistics for the InnoDB compressed buffer pool"),
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
STRUCT_FLD(init, i_s_cmpmem_init),
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
STRUCT_FLD(deinit, i_s_common_deinit),
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
STRUCT_FLD(version, INNODB_VERSION_SHORT),
/* struct st_mysql_show_var* */
STRUCT_FLD(status_vars, NULL),
/* struct st_mysql_sys_var** */
STRUCT_FLD(system_vars, NULL),
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
UNIV_INTERN struct st_maria_plugin i_s_innodb_cmpmem_reset =
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
/* pointer to type-specific plugin descriptor */
/* void* */
STRUCT_FLD(info, &i_s_info),
/* plugin name */
/* const char* */
STRUCT_FLD(name, "INNODB_CMPMEM_RESET"),
/* plugin author (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(author, plugin_author),
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(descr, "Statistics for the InnoDB compressed buffer pool;"
" reset cumulated counts"),
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
STRUCT_FLD(init, i_s_cmpmem_reset_init),
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
STRUCT_FLD(deinit, i_s_common_deinit),
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
STRUCT_FLD(version, INNODB_VERSION_SHORT),
/* struct st_mysql_show_var* */
STRUCT_FLD(status_vars, NULL),
/* struct st_mysql_sys_var** */
STRUCT_FLD(system_vars, NULL),
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
/*******************************************************************//** /*******************************************************************//**
Unbind a dynamic INFORMATION_SCHEMA table. Unbind a dynamic INFORMATION_SCHEMA table.
...@@ -1656,6 +1978,52 @@ innodb_sys_tables_init( ...@@ -1656,6 +1978,52 @@ innodb_sys_tables_init(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_tables =
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
/* pointer to type-specific plugin descriptor */
/* void* */
STRUCT_FLD(info, &i_s_info),
/* plugin name */
/* const char* */
STRUCT_FLD(name, "INNODB_SYS_TABLES"),
/* plugin author (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(author, "Percona"),
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(descr, "InnoDB SYS_TABLES"),
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
STRUCT_FLD(init, innodb_sys_tables_init),
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
STRUCT_FLD(deinit, i_s_common_deinit),
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
STRUCT_FLD(version, INNODB_VERSION_SHORT),
/* struct st_mysql_show_var* */
STRUCT_FLD(status_vars, NULL),
/* struct st_mysql_sys_var** */
STRUCT_FLD(system_vars, NULL),
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
/* Fields of the dynamic table INFORMATION_SCHEMA.SYS_TABLESTATS */ /* Fields of the dynamic table INFORMATION_SCHEMA.SYS_TABLESTATS */
static ST_FIELD_INFO innodb_sys_tablestats_fields_info[] = static ST_FIELD_INFO innodb_sys_tablestats_fields_info[] =
...@@ -1907,6 +2275,52 @@ innodb_sys_tablestats_init( ...@@ -1907,6 +2275,52 @@ innodb_sys_tablestats_init(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_tablestats =
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
/* pointer to type-specific plugin descriptor */
/* void* */
STRUCT_FLD(info, &i_s_info),
/* plugin name */
/* const char* */
STRUCT_FLD(name, "INNODB_SYS_TABLESTATS"),
/* plugin author (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(author, "Percona"),
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(descr, "InnoDB SYS_TABLESTATS"),
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
STRUCT_FLD(init, innodb_sys_tablestats_init),
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
STRUCT_FLD(deinit, i_s_common_deinit),
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
STRUCT_FLD(version, INNODB_VERSION_SHORT),
/* struct st_mysql_show_var* */
STRUCT_FLD(status_vars, NULL),
/* struct st_mysql_sys_var** */
STRUCT_FLD(system_vars, NULL),
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
/* Fields of the dynamic table INFORMATION_SCHEMA.SYS_INDEXES */ /* Fields of the dynamic table INFORMATION_SCHEMA.SYS_INDEXES */
static ST_FIELD_INFO innodb_sysindex_fields_info[] = static ST_FIELD_INFO innodb_sysindex_fields_info[] =
...@@ -2097,16 +2511,62 @@ innodb_sys_indexes_init( ...@@ -2097,16 +2511,62 @@ innodb_sys_indexes_init(
{ {
ST_SCHEMA_TABLE* schema; ST_SCHEMA_TABLE* schema;
DBUG_ENTER("innodb_sys_index_init"); DBUG_ENTER("innodb_sys_index_init");
schema = (ST_SCHEMA_TABLE*) p;
schema->fields_info = innodb_sysindex_fields_info;
schema->fill_table = i_s_sys_indexes_fill_table;
DBUG_RETURN(0);
}
UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_indexes =
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
/* pointer to type-specific plugin descriptor */
/* void* */
STRUCT_FLD(info, &i_s_info),
/* plugin name */
/* const char* */
STRUCT_FLD(name, "INNODB_SYS_INDEXES"),
/* plugin author (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(author, "Percona"),
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(descr, "InnoDB SYS_INDEXES"),
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
STRUCT_FLD(init, innodb_sys_indexes_init),
schema = (ST_SCHEMA_TABLE*) p; /* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
STRUCT_FLD(deinit, i_s_common_deinit),
schema->fields_info = innodb_sysindex_fields_info; /* plugin version (for SHOW PLUGINS) */
schema->fill_table = i_s_sys_indexes_fill_table; /* unsigned int */
STRUCT_FLD(version, INNODB_VERSION_SHORT),
DBUG_RETURN(0); /* struct st_mysql_show_var* */
} STRUCT_FLD(status_vars, NULL),
/* struct st_mysql_sys_var** */
STRUCT_FLD(system_vars, NULL),
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
/* Fields of the dynamic table INFORMATION_SCHEMA.SYS_COLUMNS */ /* Fields of the dynamic table INFORMATION_SCHEMA.SYS_COLUMNS */
static ST_FIELD_INFO innodb_sys_columns_fields_info[] = static ST_FIELD_INFO innodb_sys_columns_fields_info[] =
...@@ -2297,6 +2757,52 @@ innodb_sys_columns_init( ...@@ -2297,6 +2757,52 @@ innodb_sys_columns_init(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_columns =
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
/* pointer to type-specific plugin descriptor */
/* void* */
STRUCT_FLD(info, &i_s_info),
/* plugin name */
/* const char* */
STRUCT_FLD(name, "INNODB_SYS_COLUMNS"),
/* plugin author (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(author, "Percona"),
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(descr, "InnoDB SYS_COLUMNS"),
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
STRUCT_FLD(init, innodb_sys_columns_init),
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
STRUCT_FLD(deinit, i_s_common_deinit),
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
STRUCT_FLD(version, INNODB_VERSION_SHORT),
/* struct st_mysql_show_var* */
STRUCT_FLD(status_vars, NULL),
/* struct st_mysql_sys_var** */
STRUCT_FLD(system_vars, NULL),
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_sys_fields */ /* Fields of the dynamic table INFORMATION_SCHEMA.innodb_sys_fields */
static ST_FIELD_INFO innodb_sys_fields_fields_info[] = static ST_FIELD_INFO innodb_sys_fields_fields_info[] =
{ {
...@@ -2458,6 +2964,52 @@ innodb_sys_fields_init( ...@@ -2458,6 +2964,52 @@ innodb_sys_fields_init(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_fields =
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
/* pointer to type-specific plugin descriptor */
/* void* */
STRUCT_FLD(info, &i_s_info),
/* plugin name */
/* const char* */
STRUCT_FLD(name, "INNODB_SYS_FIELDS"),
/* plugin author (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(author, "Percona"),
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(descr, "InnoDB SYS_FIELDS"),
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
STRUCT_FLD(init, innodb_sys_fields_init),
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
STRUCT_FLD(deinit, i_s_common_deinit),
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
STRUCT_FLD(version, INNODB_VERSION_SHORT),
/* struct st_mysql_show_var* */
STRUCT_FLD(status_vars, NULL),
/* struct st_mysql_sys_var** */
STRUCT_FLD(system_vars, NULL),
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_sys_foreign */ /* Fields of the dynamic table INFORMATION_SCHEMA.innodb_sys_foreign */
static ST_FIELD_INFO innodb_sys_foreign_fields_info[] = static ST_FIELD_INFO innodb_sys_foreign_fields_info[] =
...@@ -2633,6 +3185,52 @@ innodb_sys_foreign_init( ...@@ -2633,6 +3185,52 @@ innodb_sys_foreign_init(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_foreign =
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
/* pointer to type-specific plugin descriptor */
/* void* */
STRUCT_FLD(info, &i_s_info),
/* plugin name */
/* const char* */
STRUCT_FLD(name, "INNODB_SYS_FOREIGN"),
/* plugin author (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(author, "Percona"),
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(descr, "InnoDB SYS_FOREIGN"),
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
STRUCT_FLD(init, innodb_sys_foreign_init),
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
STRUCT_FLD(deinit, i_s_common_deinit),
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
STRUCT_FLD(version, INNODB_VERSION_SHORT),
/* struct st_mysql_show_var* */
STRUCT_FLD(status_vars, NULL),
/* struct st_mysql_sys_var** */
STRUCT_FLD(system_vars, NULL),
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_sys_foreign_cols */ /* Fields of the dynamic table INFORMATION_SCHEMA.innodb_sys_foreign_cols */
static ST_FIELD_INFO innodb_sys_foreign_cols_fields_info[] = static ST_FIELD_INFO innodb_sys_foreign_cols_fields_info[] =
{ {
...@@ -2801,6 +3399,52 @@ innodb_sys_foreign_cols_init( ...@@ -2801,6 +3399,52 @@ innodb_sys_foreign_cols_init(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_foreign_cols =
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
/* pointer to type-specific plugin descriptor */
/* void* */
STRUCT_FLD(info, &i_s_info),
/* plugin name */
/* const char* */
STRUCT_FLD(name, "INNODB_SYS_FOREIGN_COLS"),
/* plugin author (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(author, "Percona"),
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(descr, "InnoDB SYS_FOREIGN_COLS"),
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
STRUCT_FLD(init, innodb_sys_foreign_cols_init),
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
STRUCT_FLD(deinit, i_s_common_deinit),
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
STRUCT_FLD(version, INNODB_VERSION_SHORT),
/* struct st_mysql_show_var* */
STRUCT_FLD(status_vars, NULL),
/* struct st_mysql_sys_var** */
STRUCT_FLD(system_vars, NULL),
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_sys_stats */ /* Fields of the dynamic table INFORMATION_SCHEMA.innodb_sys_stats */
static ST_FIELD_INFO innodb_sys_stats_fields_info[] = static ST_FIELD_INFO innodb_sys_stats_fields_info[] =
...@@ -2970,6 +3614,52 @@ innodb_sys_stats_init( ...@@ -2970,6 +3614,52 @@ innodb_sys_stats_init(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_stats =
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
/* pointer to type-specific plugin descriptor */
/* void* */
STRUCT_FLD(info, &i_s_info),
/* plugin name */
/* const char* */
STRUCT_FLD(name, "INNODB_SYS_STATS"),
/* plugin author (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(author, "Percona"),
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(descr, "XtraDB SYS_STATS table"),
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
STRUCT_FLD(init, innodb_sys_stats_init),
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
STRUCT_FLD(deinit, i_s_common_deinit),
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
STRUCT_FLD(version, INNODB_VERSION_SHORT),
/* struct st_mysql_show_var* */
STRUCT_FLD(status_vars, NULL),
/* struct st_mysql_sys_var** */
STRUCT_FLD(system_vars, NULL),
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
/*********************************************************************** /***********************************************************************
*/ */
...@@ -3066,25 +3756,71 @@ i_s_innodb_rseg_fill( ...@@ -3066,25 +3756,71 @@ i_s_innodb_rseg_fill(
rseg = UT_LIST_GET_NEXT(rseg_list, rseg); rseg = UT_LIST_GET_NEXT(rseg_list, rseg);
} }
DBUG_RETURN(status); DBUG_RETURN(status);
} }
static
int
i_s_innodb_rseg_init(
/*=================*/
/* out: 0 on success */
void* p) /* in/out: table schema object */
{
DBUG_ENTER("i_s_innodb_rseg_init");
ST_SCHEMA_TABLE* schema = (ST_SCHEMA_TABLE*) p;
schema->fields_info = i_s_innodb_rseg_fields_info;
schema->fill_table = i_s_innodb_rseg_fill;
DBUG_RETURN(0);
}
UNIV_INTERN struct st_maria_plugin i_s_innodb_rseg =
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
/* pointer to type-specific plugin descriptor */
/* void* */
STRUCT_FLD(info, &i_s_info),
/* plugin name */
/* const char* */
STRUCT_FLD(name, "INNODB_RSEG"),
/* plugin author (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(author, "Percona"),
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(descr, "InnoDB rollback segment information"),
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
STRUCT_FLD(init, i_s_innodb_rseg_init),
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
STRUCT_FLD(deinit, i_s_common_deinit),
static /* plugin version (for SHOW PLUGINS) */
int /* unsigned int */
i_s_innodb_rseg_init( STRUCT_FLD(version, 0x0100 /* 1.0 */),
/*=================*/
/* out: 0 on success */
void* p) /* in/out: table schema object */
{
DBUG_ENTER("i_s_innodb_rseg_init");
ST_SCHEMA_TABLE* schema = (ST_SCHEMA_TABLE*) p;
schema->fields_info = i_s_innodb_rseg_fields_info; /* struct st_mysql_show_var* */
schema->fill_table = i_s_innodb_rseg_fill; STRUCT_FLD(status_vars, NULL),
DBUG_RETURN(0); /* struct st_mysql_sys_var** */
} STRUCT_FLD(system_vars, NULL),
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
/*********************************************************************** /***********************************************************************
*/ */
...@@ -3402,7 +4138,37 @@ i_s_innodb_index_stats_init( ...@@ -3402,7 +4138,37 @@ i_s_innodb_index_stats_init(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
UNIV_INTERN struct st_maria_plugin i_s_innodb_table_stats =
{
STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
STRUCT_FLD(info, &i_s_info),
STRUCT_FLD(name, "INNODB_TABLE_STATS"),
STRUCT_FLD(author, "Percona"),
STRUCT_FLD(descr, "InnoDB table statistics in memory"),
STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
STRUCT_FLD(init, i_s_innodb_table_stats_init),
STRUCT_FLD(deinit, i_s_common_deinit),
STRUCT_FLD(version, 0x0100 /* 1.0 */),
STRUCT_FLD(status_vars, NULL),
STRUCT_FLD(system_vars, NULL),
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
UNIV_INTERN struct st_maria_plugin i_s_innodb_index_stats =
{
STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
STRUCT_FLD(info, &i_s_info),
STRUCT_FLD(name, "INNODB_INDEX_STATS"),
STRUCT_FLD(author, "Percona"),
STRUCT_FLD(descr, "InnoDB index statistics in memory"),
STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
STRUCT_FLD(init, i_s_innodb_index_stats_init),
STRUCT_FLD(deinit, i_s_common_deinit),
STRUCT_FLD(version, 0x0100 /* 1.0 */),
STRUCT_FLD(status_vars, NULL),
STRUCT_FLD(system_vars, NULL),
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
/*********************************************************************** /***********************************************************************
*/ */
...@@ -3556,6 +4322,21 @@ i_s_innodb_admin_command_init( ...@@ -3556,6 +4322,21 @@ i_s_innodb_admin_command_init(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
UNIV_INTERN struct st_maria_plugin i_s_innodb_admin_command =
{
STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
STRUCT_FLD(info, &i_s_info),
STRUCT_FLD(name, "XTRADB_ADMIN_COMMAND"),
STRUCT_FLD(author, "Percona"),
STRUCT_FLD(descr, "XtraDB specific command acceptor"),
STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
STRUCT_FLD(init, i_s_innodb_admin_command_init),
STRUCT_FLD(deinit, i_s_common_deinit),
STRUCT_FLD(version, 0x0100 /* 1.0 */),
STRUCT_FLD(status_vars, NULL),
STRUCT_FLD(system_vars, NULL),
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
/*********************************************************************** /***********************************************************************
*/ */
...@@ -4106,337 +4887,146 @@ i_s_innodb_buffer_pool_pages_blob_init( ...@@ -4106,337 +4887,146 @@ i_s_innodb_buffer_pool_pages_blob_init(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
/* MariaDB structures of I_S plugins above */
UNIV_INTERN struct st_maria_plugin i_s_innodb_trx_maria = UNIV_INTERN struct st_maria_plugin i_s_innodb_buffer_pool_pages =
{
MYSQL_INFORMATION_SCHEMA_PLUGIN,
&i_s_info,
"INNODB_TRX",
plugin_author,
"InnoDB transactions",
PLUGIN_LICENSE_GPL,
innodb_trx_init,
i_s_common_deinit,
INNODB_VERSION_SHORT,
NULL,
NULL,
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
UNIV_INTERN struct st_maria_plugin i_s_innodb_locks_maria =
{
MYSQL_INFORMATION_SCHEMA_PLUGIN,
&i_s_info,
"INNODB_LOCKS",
plugin_author,
"InnoDB conflicting locks",
PLUGIN_LICENSE_GPL,
innodb_locks_init,
i_s_common_deinit,
INNODB_VERSION_SHORT,
NULL,
NULL,
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
UNIV_INTERN struct st_maria_plugin i_s_innodb_lock_waits_maria =
{
MYSQL_INFORMATION_SCHEMA_PLUGIN,
&i_s_info,
"INNODB_LOCK_WAITS",
plugin_author,
"InnoDB which lock is blocking which",
PLUGIN_LICENSE_GPL,
innodb_lock_waits_init,
i_s_common_deinit,
INNODB_VERSION_SHORT,
NULL,
NULL,
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
UNIV_INTERN struct st_maria_plugin i_s_innodb_cmp_maria =
{
MYSQL_INFORMATION_SCHEMA_PLUGIN,
&i_s_info,
"INNODB_CMP",
plugin_author,
"Statistics for the InnoDB compression",
PLUGIN_LICENSE_GPL,
i_s_cmp_init,
i_s_common_deinit,
INNODB_VERSION_SHORT,
NULL,
NULL,
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
UNIV_INTERN struct st_maria_plugin i_s_innodb_cmp_reset_maria =
{
MYSQL_INFORMATION_SCHEMA_PLUGIN,
&i_s_info,
"INNODB_CMP_RESET",
plugin_author,
"Statistics for the InnoDB compression; reset cumulated counts",
PLUGIN_LICENSE_GPL,
i_s_cmp_reset_init,
i_s_common_deinit,
INNODB_VERSION_SHORT,
NULL,
NULL,
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
UNIV_INTERN struct st_maria_plugin i_s_innodb_cmpmem_maria =
{
MYSQL_INFORMATION_SCHEMA_PLUGIN,
&i_s_info,
"INNODB_CMPMEM",
plugin_author,
"Statistics for the InnoDB compressed buffer pool",
PLUGIN_LICENSE_GPL,
i_s_cmpmem_init,
i_s_common_deinit,
INNODB_VERSION_SHORT,
NULL,
NULL,
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
UNIV_INTERN struct st_maria_plugin i_s_innodb_cmpmem_reset_maria =
{
MYSQL_INFORMATION_SCHEMA_PLUGIN,
&i_s_info,
"INNODB_CMPMEM_RESET",
plugin_author,
"Statistics for the InnoDB compressed buffer pool; reset cumulated counts",
PLUGIN_LICENSE_GPL,
i_s_cmpmem_reset_init,
i_s_common_deinit,
INNODB_VERSION_SHORT,
NULL,
NULL,
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_tables_maria =
{
MYSQL_INFORMATION_SCHEMA_PLUGIN,
&i_s_info,
"INNODB_SYS_TABLES",
"Percona",
"InnoDB SYS_TABLES",
PLUGIN_LICENSE_GPL,
innodb_sys_tables_init,
i_s_common_deinit,
INNODB_VERSION_SHORT,
NULL,
NULL,
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_tablestats_maria =
{
MYSQL_INFORMATION_SCHEMA_PLUGIN,
&i_s_info,
"INNODB_SYS_TABLESTATS",
"Percona",
"InnoDB SYS_TABLESTATS",
PLUGIN_LICENSE_GPL,
innodb_sys_tablestats_init,
i_s_common_deinit,
INNODB_VERSION_SHORT,
NULL,
NULL,
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_indexes_maria =
{
MYSQL_INFORMATION_SCHEMA_PLUGIN,
&i_s_info,
"INNODB_SYS_INDEXES",
"Percona",
"InnoDB SYS_INDEXES",
PLUGIN_LICENSE_GPL,
innodb_sys_indexes_init,
i_s_common_deinit,
INNODB_VERSION_SHORT,
NULL,
NULL,
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_columns_maria =
{
MYSQL_INFORMATION_SCHEMA_PLUGIN,
&i_s_info,
"INNODB_SYS_COLUMNS",
"Percona",
"InnoDB SYS_COLUMNS",
PLUGIN_LICENSE_GPL,
innodb_sys_columns_init,
i_s_common_deinit,
INNODB_VERSION_SHORT,
NULL,
NULL,
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_fields_maria =
{
MYSQL_INFORMATION_SCHEMA_PLUGIN,
&i_s_info,
"INNODB_SYS_FIELDS",
"Percona",
"InnoDB SYS_FIELDS",
PLUGIN_LICENSE_GPL,
innodb_sys_fields_init,
i_s_common_deinit,
INNODB_VERSION_SHORT,
NULL,
NULL,
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_foreign_maria =
{
MYSQL_INFORMATION_SCHEMA_PLUGIN,
&i_s_info,
"INNODB_SYS_FOREIGN",
"Percona",
"InnoDB SYS_FOREIGN",
PLUGIN_LICENSE_GPL,
innodb_sys_foreign_init,
i_s_common_deinit,
INNODB_VERSION_SHORT,
NULL,
NULL,
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_foreign_cols_maria =
{
MYSQL_INFORMATION_SCHEMA_PLUGIN,
&i_s_info,
"INNODB_SYS_FOREIGN_COLS",
"Percona",
"InnoDB SYS_FOREIGN_COLS",
PLUGIN_LICENSE_GPL,
innodb_sys_foreign_cols_init,
i_s_common_deinit,
INNODB_VERSION_SHORT,
NULL,
NULL,
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_stats_maria =
{
MYSQL_INFORMATION_SCHEMA_PLUGIN,
&i_s_info,
"INNODB_SYS_STATS",
"Percona",
"XtraDB SYS_STATS table",
PLUGIN_LICENSE_GPL,
innodb_sys_stats_init,
i_s_common_deinit,
INNODB_VERSION_SHORT,
NULL,
NULL,
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
UNIV_INTERN struct st_maria_plugin i_s_innodb_rseg_maria =
{
MYSQL_INFORMATION_SCHEMA_PLUGIN,
&i_s_info,
"INNODB_RSEG",
"Percona",
"InnoDB rollback segment information",
PLUGIN_LICENSE_GPL,
i_s_innodb_rseg_init,
i_s_common_deinit,
0x0100,
NULL,
NULL,
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
UNIV_INTERN struct st_maria_plugin i_s_innodb_table_stats_maria =
{
MYSQL_INFORMATION_SCHEMA_PLUGIN,
&i_s_info,
"INNODB_TABLE_STATS",
"Percona",
"InnoDB table statistics in memory",
PLUGIN_LICENSE_GPL,
i_s_innodb_table_stats_init,
i_s_common_deinit,
0x0100,
NULL,
NULL,
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
UNIV_INTERN struct st_maria_plugin i_s_innodb_index_stats_maria =
{
MYSQL_INFORMATION_SCHEMA_PLUGIN,
&i_s_info,
"INNODB_INDEX_STATS",
"Percona",
"InnoDB index statistics in memory",
PLUGIN_LICENSE_GPL,
i_s_innodb_index_stats_init,
i_s_common_deinit,
0x0100,
NULL,
NULL,
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
UNIV_INTERN struct st_maria_plugin i_s_innodb_admin_command_maria =
{
MYSQL_INFORMATION_SCHEMA_PLUGIN,
&i_s_info,
"XTRADB_ADMIN_COMMAND",
"Percona",
"XtraDB specific command acceptor",
PLUGIN_LICENSE_GPL,
i_s_innodb_admin_command_init,
i_s_common_deinit,
0x0100,
NULL,
NULL,
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
};
UNIV_INTERN struct st_maria_plugin i_s_innodb_buffer_pool_pages_maria =
{ {
MYSQL_INFORMATION_SCHEMA_PLUGIN, /* the plugin type (a MYSQL_XXX_PLUGIN value) */
&i_s_info, /* int */
"INNODB_BUFFER_POOL_PAGES", STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
"Percona",
"InnoDB buffer pool pages", /* pointer to type-specific plugin descriptor */
PLUGIN_LICENSE_GPL, /* void* */
i_s_innodb_buffer_pool_pages_init, STRUCT_FLD(info, &i_s_info),
i_s_common_deinit,
0x0100, /* plugin name */
NULL, /* const char* */
NULL, STRUCT_FLD(name, "INNODB_BUFFER_POOL_PAGES"),
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
/* plugin author (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(author, "Percona"),
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(descr, "InnoDB buffer pool pages"),
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
STRUCT_FLD(init, i_s_innodb_buffer_pool_pages_init),
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
STRUCT_FLD(deinit, i_s_common_deinit),
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
STRUCT_FLD(version, 0x0100 /* 1.0 */),
/* struct st_mysql_show_var* */
STRUCT_FLD(status_vars, NULL),
/* struct st_mysql_sys_var** */
STRUCT_FLD(system_vars, NULL),
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
}; };
UNIV_INTERN struct st_maria_plugin i_s_innodb_buffer_pool_pages_index_maria =
UNIV_INTERN struct st_maria_plugin i_s_innodb_buffer_pool_pages_index =
{ {
MYSQL_INFORMATION_SCHEMA_PLUGIN, /* the plugin type (a MYSQL_XXX_PLUGIN value) */
&i_s_info, /* int */
"INNODB_BUFFER_POOL_PAGES_INDEX", STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
"Percona",
"InnoDB buffer pool index pages", /* pointer to type-specific plugin descriptor */
PLUGIN_LICENSE_GPL, /* void* */
i_s_innodb_buffer_pool_pages_index_init, STRUCT_FLD(info, &i_s_info),
i_s_common_deinit,
0x0100, /* plugin name */
NULL, /* const char* */
NULL, STRUCT_FLD(name, "INNODB_BUFFER_POOL_PAGES_INDEX"),
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
/* plugin author (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(author, "Percona"),
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(descr, "InnoDB buffer pool index pages"),
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
STRUCT_FLD(init, i_s_innodb_buffer_pool_pages_index_init),
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
STRUCT_FLD(deinit, i_s_common_deinit),
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
STRUCT_FLD(version, 0x0100 /* 1.0 */),
/* struct st_mysql_show_var* */
STRUCT_FLD(status_vars, NULL),
/* struct st_mysql_sys_var** */
STRUCT_FLD(system_vars, NULL),
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
}; };
UNIV_INTERN struct st_maria_plugin i_s_innodb_buffer_pool_pages_blob_maria =
UNIV_INTERN struct st_maria_plugin i_s_innodb_buffer_pool_pages_blob =
{ {
MYSQL_INFORMATION_SCHEMA_PLUGIN, /* the plugin type (a MYSQL_XXX_PLUGIN value) */
&i_s_info, /* int */
"INNODB_BUFFER_POOL_PAGES_BLOB", STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
"Percona",
"InnoDB buffer pool blob pages", /* pointer to type-specific plugin descriptor */
PLUGIN_LICENSE_GPL, /* void* */
i_s_innodb_buffer_pool_pages_blob_init, STRUCT_FLD(info, &i_s_info),
i_s_common_deinit,
0x0100, /* plugin name */
NULL, /* const char* */
NULL, STRUCT_FLD(name, "INNODB_BUFFER_POOL_PAGES_BLOB"),
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
/* plugin author (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(author, "Percona"),
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(descr, "InnoDB buffer pool blob pages"),
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
STRUCT_FLD(init, i_s_innodb_buffer_pool_pages_blob_init),
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
STRUCT_FLD(deinit, i_s_common_deinit),
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
STRUCT_FLD(version, 0x0100 /* 1.0 */),
/* struct st_mysql_show_var* */
STRUCT_FLD(status_vars, NULL),
/* struct st_mysql_sys_var** */
STRUCT_FLD(system_vars, NULL),
INNODB_VERSION_STR, MariaDB_PLUGIN_MATURITY_STABLE
}; };
...@@ -4632,58 +5222,7 @@ i_s_innodb_undo_logs_init( ...@@ -4632,58 +5222,7 @@ i_s_innodb_undo_logs_init(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
UNIV_INTERN struct st_mysql_plugin i_s_innodb_undo_logs = UNIV_INTERN struct st_maria_plugin i_s_innodb_undo_logs =
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
/* pointer to type-specific plugin descriptor */
/* void* */
STRUCT_FLD(info, &i_s_info),
/* plugin name */
/* const char* */
STRUCT_FLD(name, "INNODB_UNDO_LOGS"),
/* plugin author (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(author, "Percona"),
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(descr, "InnoDB rollback undo segment information"),
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
STRUCT_FLD(init, i_s_innodb_undo_logs_init),
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */ STRUCT_FLD(deinit, i_s_common_deinit),
/* plugin version (for SHOW PLUGINS) */
STRUCT_FLD(version, 0x0100 /* 1.0 */),
/* struct st_mysql_show_var* */
STRUCT_FLD(status_vars, NULL),
/* struct st_mysql_sys_var** */
STRUCT_FLD(system_vars, NULL),
/* reserved for dependency checking */
/* void* */
STRUCT_FLD(__reserved1, NULL),
/* Plugin flags */
/* unsigned long */
STRUCT_FLD(flags, 0UL),
};
UNIV_INTERN struct st_maria_plugin i_s_innodb_undo_logs_maria =
{ {
/* the plugin type (a MYSQL_XXX_PLUGIN value) */ /* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */ /* int */
......
storage/xtradb/handler/i_s.h
View file @ c2da54ef
...@@ -28,52 +28,28 @@ Created July 18, 2007 Vasil Dimov ...@@ -28,52 +28,28 @@ Created July 18, 2007 Vasil Dimov
const char plugin_author[] = "Oracle Corporation"; const char plugin_author[] = "Oracle Corporation";
extern struct st_mysql_plugin i_s_innodb_trx; extern struct st_maria_plugin i_s_innodb_trx;
extern struct st_mysql_plugin i_s_innodb_locks; extern struct st_maria_plugin i_s_innodb_locks;
extern struct st_mysql_plugin i_s_innodb_lock_waits; extern struct st_maria_plugin i_s_innodb_lock_waits;
extern struct st_mysql_plugin i_s_innodb_cmp; extern struct st_maria_plugin i_s_innodb_cmp;
extern struct st_mysql_plugin i_s_innodb_cmp_reset; extern struct st_maria_plugin i_s_innodb_cmp_reset;
extern struct st_mysql_plugin i_s_innodb_cmpmem; extern struct st_maria_plugin i_s_innodb_cmpmem;
extern struct st_mysql_plugin i_s_innodb_cmpmem_reset; extern struct st_maria_plugin i_s_innodb_cmpmem_reset;
extern struct st_mysql_plugin i_s_innodb_sys_tables; extern struct st_maria_plugin i_s_innodb_sys_tables;
extern struct st_mysql_plugin i_s_innodb_sys_tablestats; extern struct st_maria_plugin i_s_innodb_sys_tablestats;
extern struct st_mysql_plugin i_s_innodb_sys_indexes; extern struct st_maria_plugin i_s_innodb_sys_indexes;
extern struct st_mysql_plugin i_s_innodb_sys_columns; extern struct st_maria_plugin i_s_innodb_sys_columns;
extern struct st_mysql_plugin i_s_innodb_sys_fields; extern struct st_maria_plugin i_s_innodb_sys_fields;
extern struct st_mysql_plugin i_s_innodb_sys_foreign; extern struct st_maria_plugin i_s_innodb_sys_foreign;
extern struct st_mysql_plugin i_s_innodb_sys_foreign_cols; extern struct st_maria_plugin i_s_innodb_sys_foreign_cols;
extern struct st_mysql_plugin i_s_innodb_rseg; extern struct st_maria_plugin i_s_innodb_rseg;
extern struct st_mysql_plugin i_s_innodb_undo_logs; extern struct st_maria_plugin i_s_innodb_undo_logs;
extern struct st_mysql_plugin i_s_innodb_sys_stats; extern struct st_maria_plugin i_s_innodb_sys_stats;
extern struct st_mysql_plugin i_s_innodb_table_stats; extern struct st_maria_plugin i_s_innodb_table_stats;
extern struct st_mysql_plugin i_s_innodb_index_stats; extern struct st_maria_plugin i_s_innodb_index_stats;
extern struct st_mysql_plugin i_s_innodb_admin_command; extern struct st_maria_plugin i_s_innodb_admin_command;
extern struct st_mysql_plugin i_s_innodb_buffer_pool_pages; extern struct st_maria_plugin i_s_innodb_buffer_pool_pages;
extern struct st_mysql_plugin i_s_innodb_buffer_pool_pages_index; extern struct st_maria_plugin i_s_innodb_buffer_pool_pages_index;
extern struct st_mysql_plugin i_s_innodb_buffer_pool_pages_blob; extern struct st_maria_plugin i_s_innodb_buffer_pool_pages_blob;
extern struct st_maria_plugin i_s_innodb_trx_maria;
extern struct st_maria_plugin i_s_innodb_locks_maria;
extern struct st_maria_plugin i_s_innodb_lock_waits_maria;
extern struct st_maria_plugin i_s_innodb_cmp_maria;
extern struct st_maria_plugin i_s_innodb_cmp_reset_maria;
extern struct st_maria_plugin i_s_innodb_cmpmem_maria;
extern struct st_maria_plugin i_s_innodb_cmpmem_reset_maria;
extern struct st_maria_plugin i_s_innodb_sys_tables_maria;
extern struct st_maria_plugin i_s_innodb_sys_tablestats_maria;
extern struct st_maria_plugin i_s_innodb_sys_indexes_maria;
extern struct st_maria_plugin i_s_innodb_sys_columns_maria;
extern struct st_maria_plugin i_s_innodb_sys_fields_maria;
extern struct st_maria_plugin i_s_innodb_sys_foreign_maria;
extern struct st_maria_plugin i_s_innodb_sys_foreign_cols_maria;
extern struct st_maria_plugin i_s_innodb_sys_stats_maria;
extern struct st_maria_plugin i_s_innodb_rseg_maria;
extern struct st_maria_plugin i_s_innodb_undo_logs_maria;
extern struct st_maria_plugin i_s_innodb_table_stats_maria;
extern struct st_maria_plugin i_s_innodb_index_stats_maria;
extern struct st_maria_plugin i_s_innodb_admin_command_maria;
extern struct st_maria_plugin i_s_innodb_buffer_pool_pages_maria;
extern struct st_maria_plugin i_s_innodb_buffer_pool_pages_index_maria;
extern struct st_maria_plugin i_s_innodb_buffer_pool_pages_blob_maria;
#endif /* i_s_h */ #endif /* i_s_h */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7