changes to innodb_show_enhancements

handler/i_s.cc

@@ -221,34 +221,7 @@ static ST_FIELD_INFO	innodb_patches_fields_info[] =
 	 STRUCT_FLD(old_name,		""),
 	 STRUCT_FLD(open_method,	SKIP_OPEN_TABLE)},
 
-#define IDX_PATCH_VER		2
-	{STRUCT_FLD(field_name,		"version"),
-	 STRUCT_FLD(field_length,	10),
-	 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)},
-
-#define IDX_PATCH_AUTHOR	3
-	{STRUCT_FLD(field_name,		"author"),
-	 STRUCT_FLD(field_length,	50),
-	 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)},
-
-#define IDX_PATCH_LICENCE	4
-	{STRUCT_FLD(field_name,		"licence"),
-	 STRUCT_FLD(field_length,	50),
-	 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)},
-
-#define IDX_PATCH_COMMENT		5
+#define IDX_PATCH_COMMENT		2
 	{STRUCT_FLD(field_name,		"comment"),
 	 STRUCT_FLD(field_length,	100),
 	 STRUCT_FLD(field_type,		MYSQL_TYPE_STRING),
@@ -257,7 +230,7 @@ static ST_FIELD_INFO	innodb_patches_fields_info[] =
 	 STRUCT_FLD(old_name,		""),
 	 STRUCT_FLD(open_method,	SKIP_OPEN_TABLE)},
 
-#define IDX_PATCH_LINK			5
+#define IDX_PATCH_LINK			3
 	{STRUCT_FLD(field_name,		"link"),
 	 STRUCT_FLD(field_length,	255),
 	 STRUCT_FLD(field_type,		MYSQL_TYPE_STRING),
@@ -306,11 +279,8 @@ innodb_patches_fill(
 
    	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);
+   	field_store_string(fields[2],innodb_enhancements[i].comment);
+   	field_store_string(fields[3],innodb_enhancements[i].link);
 
 	if (schema_table_store_record(thd, table)) {
 		status = 1;

handler/innodb_patch_info.h

@@ -20,15 +20,12 @@
 struct innodb_enhancement {
        const char *file;
        const char *name;
-       const char *version;
-       const char *author;
-       const char *license;
        const char *comment;
        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}
+{"innodb_show_enhancements","I_S.PERCONA_INNODB_ENHANCEMENTS","","http://www.percona.com/docs/wiki/percona-innodb-plugin:innodb_show_enhancements"},
+{"innodb_show_status","Improvements to SHOW INNODB STATUS","Memory information and lock info fixes","http://www.percona.com/docs/wiki/percona-innodb-plugin:innodb_show_status"},
+{"innodb_io","Improvements to InnoDB IO","","http://www.percona.com/docs/wiki/percona-innodb-plugin:innodb_io"},
+{"innodb_rw_lock","InnoDB RW-lock fixes","Useful for 8+ cores SMP systems","http://www.percona.com/docs/wiki/percona-innodb-plugin:innodb_rw_lock"},
+{NULL, NULL, NULL, NULL}
 };