Commit 166fe37f authored by Vadim Tkachenko's avatar Vadim Tkachenko

Sync with patches rev11

parent ac2d1da3
...@@ -257,6 +257,15 @@ static ST_FIELD_INFO innodb_patches_fields_info[] = ...@@ -257,6 +257,15 @@ static ST_FIELD_INFO innodb_patches_fields_info[] =
STRUCT_FLD(old_name, ""), STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
#define IDX_PATCH_LINK 5
{STRUCT_FLD(field_name, "link"),
STRUCT_FLD(field_length, 255),
STRUCT_FLD(field_type, MYSQL_TYPE_STRING),
STRUCT_FLD(value, 0),
STRUCT_FLD(field_flags, 0),
STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
END_OF_ST_FIELD_INFO END_OF_ST_FIELD_INFO
}; };
...@@ -293,14 +302,15 @@ innodb_patches_fill( ...@@ -293,14 +302,15 @@ innodb_patches_fill(
RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name); RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
for (i = 0; innodb_patches[i].file; i++) { for (i = 0; innodb_enhancements[i].file; i++) {
field_store_string(fields[0],innodb_patches[i].file); field_store_string(fields[0],innodb_enhancements[i].file);
field_store_string(fields[1],innodb_patches[i].name); field_store_string(fields[1],innodb_enhancements[i].name);
field_store_string(fields[2],innodb_patches[i].version); field_store_string(fields[2],innodb_enhancements[i].version);
field_store_string(fields[3],innodb_patches[i].author); field_store_string(fields[3],innodb_enhancements[i].author);
field_store_string(fields[4],innodb_patches[i].license); field_store_string(fields[4],innodb_enhancements[i].license);
field_store_string(fields[5],innodb_patches[i].comment); field_store_string(fields[5],innodb_enhancements[i].comment);
field_store_string(fields[6],innodb_enhancements[i].link);
if (schema_table_store_record(thd, table)) { if (schema_table_store_record(thd, table)) {
status = 1; status = 1;
...@@ -344,7 +354,7 @@ UNIV_INTERN struct st_mysql_plugin i_s_innodb_patches = ...@@ -344,7 +354,7 @@ UNIV_INTERN struct st_mysql_plugin i_s_innodb_patches =
/* plugin name */ /* plugin name */
/* const char* */ /* const char* */
STRUCT_FLD(name, "INNODB_PATCHES"), STRUCT_FLD(name, "PERCONA_INNODB_ENHANCEMENTS"),
/* plugin author (for SHOW PLUGINS) */ /* plugin author (for SHOW PLUGINS) */
/* const char* */ /* const char* */
...@@ -352,7 +362,7 @@ UNIV_INTERN struct st_mysql_plugin i_s_innodb_patches = ...@@ -352,7 +362,7 @@ UNIV_INTERN struct st_mysql_plugin i_s_innodb_patches =
/* general descriptive text (for SHOW PLUGINS) */ /* general descriptive text (for SHOW PLUGINS) */
/* const char* */ /* const char* */
STRUCT_FLD(descr, "Patches applied to InnoDB plugin"), STRUCT_FLD(descr, "Enhancements applied to InnoDB plugin"),
/* the plugin license (PLUGIN_LICENSE_XXX) */ /* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */ /* int */
......
...@@ -17,17 +17,18 @@ ...@@ -17,17 +17,18 @@
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
struct innodb_patch { struct innodb_enhancement {
const char *file; const char *file;
const char *name; const char *name;
const char *version; const char *version;
const char *author; const char *author;
const char *license; const char *license;
const char *comment; const char *comment;
}innodb_patches[] = { const char *link;
{"innodb_show_patches.patch","I_S.INNODB_PATCHES","1.0","Percona","GPLv2",""}, }innodb_enhancements[] = {
{"innodb_show_status.patch","Fixes to SHOW INNODB STATUS","1.0","Percona","GPLv2","Memory information and lock info fixes"}, {"innodb_show_enhancements","I_S.PERCONA_INNODB_ENHANCEMENTS","1.0","Percona","GPLv2","","http://www.percona.com/docs/wiki/percona-innodb-plugin:innodb_show_enhancements"},
{"innodb_io_patches.patch","Patches to InnoDB IO","1.0","Percona","GPLv2",""}, {"innodb_show_status","Improvements to SHOW INNODB STATUS","1.0","Percona","GPLv2","Memory information and lock info fixes","http://www.percona.com/docs/wiki/percona-innodb-plugin:innodb_show_status"},
{"innodb_rw_lock.patch","InnoDB RW-lock fixes","1.0","Percona","GPLv2","Useful for 8+ cores SMP systems"}, {"innodb_io","Improvements to InnoDB IO","1.0","Percona","GPLv2","","http://www.percona.com/docs/wiki/percona-innodb-plugin:innodb_io"},
{"innodb_rw_lock","InnoDB RW-lock fixes","1.0","Percona","GPLv2","Useful for 8+ cores SMP systems","http://www.percona.com/docs/wiki/percona-innodb-plugin:innodb_rw_lock"},
{NULL, NULL, NULL, NULL, NULL, NULL} {NULL, NULL, NULL, NULL, NULL, NULL}
}; };
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