mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sync with patches rev11

Browse source
This commit is contained in:
Vadim Tkachenko 2008-12-10 15:56:17 -08:00
parent ac2d1da340
commit 166fe37fa5
2 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
handler/i_s.cc
View file

@ -257,6 +257,15 @@ static ST_FIELD_INFO innodb_patches_fields_info[] =
STRUCT_FLD(old_name, ""),
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
};
@ -293,14 +302,15 @@ innodb_patches_fill(
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[1],innodb_patches[i].name);
field_store_string(fields[2],innodb_patches[i].version);
field_store_string(fields[3],innodb_patches[i].author);
field_store_string(fields[4],innodb_patches[i].license);
field_store_string(fields[5],innodb_patches[i].comment);
field_store_string(fields[0],innodb_enhancements[i].file);
field_store_string(fields[1],innodb_enhancements[i].name);
field_store_string(fields[2],innodb_enhancements[i].version);
field_store_string(fields[3],innodb_enhancements[i].author);
field_store_string(fields[4],innodb_enhancements[i].license);
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)) {
status = 1;
@ -344,7 +354,7 @@ UNIV_INTERN struct st_mysql_plugin i_s_innodb_patches =
/* plugin name */
/* const char* */
STRUCT_FLD(name, "INNODB_PATCHES"),
STRUCT_FLD(name, "PERCONA_INNODB_ENHANCEMENTS"),
/* plugin author (for SHOW PLUGINS) */
/* const char* */
@ -352,7 +362,7 @@ UNIV_INTERN struct st_mysql_plugin i_s_innodb_patches =
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
STRUCT_FLD(descr, "Patches applied to InnoDB plugin"),
STRUCT_FLD(descr, "Enhancements applied to InnoDB plugin"),
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */

13
handler/innodb_patch_info.h
View file

@ -17,17 +17,18 @@
#pragma interface /* gcc class implementation */
#endif
struct innodb_patch {
struct innodb_enhancement {
const char *file;
const char *name;
const char *version;
const char *author;
const char *license;
const char *comment;
}innodb_patches[] = {
{"innodb_show_patches.patch","I_S.INNODB_PATCHES","1.0","Percona","GPLv2",""},
{"innodb_show_status.patch","Fixes to SHOW INNODB STATUS","1.0","Percona","GPLv2","Memory information and lock info fixes"},
{"innodb_io_patches.patch","Patches to InnoDB IO","1.0","Percona","GPLv2",""},
{"innodb_rw_lock.patch","InnoDB RW-lock fixes","1.0","Percona","GPLv2","Useful for 8+ cores SMP systems"},
const char *link;
}innodb_enhancements[] = {
{"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_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_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}
};