fix innodb plugin versions

config.h.cmake

@@ -622,6 +622,8 @@
 
 #define MYSQL_MAJOR_VERSION @MAJOR_VERSION@
 #define MYSQL_MINOR_VERSION @MINOR_VERSION@
+#define MYSQL_VERSION_PATCH @PATCH_VERSION@
+#define MYSQL_VERSION_EXTRA "@EXTRA_VERSION@"
 
 #define PACKAGE "mysql"
 #define PACKAGE_BUGREPORT ""

storage/innobase/handler/i_s.cc

@@ -2481,7 +2481,7 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_ft_default_stopword =
 
 	/* pointer to type-specific plugin descriptor */
 	/* void* */
-	STRUCT_FLD(info, &i_s_stopword_fields_info),
+	STRUCT_FLD(info, &i_s_info),
 
 	/* plugin name */
 	/* const char* */
@@ -2650,7 +2650,7 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_ft_deleted =
 
 	/* pointer to type-specific plugin descriptor */
 	/* void* */
-	STRUCT_FLD(info, &i_s_fts_doc_fields_info),
+	STRUCT_FLD(info, &i_s_info),
 
 	/* plugin name */
 	/* const char* */
@@ -2733,7 +2733,7 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_ft_being_deleted =
 
 	/* pointer to type-specific plugin descriptor */
 	/* void* */
-	STRUCT_FLD(info, &i_s_fts_doc_fields_info),
+	STRUCT_FLD(info, &i_s_info),
 
 	/* plugin name */
 	/* const char* */
@@ -2866,7 +2866,7 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_ft_inserted =
 
 	/* pointer to type-specific plugin descriptor */
 	/* void* */
-	STRUCT_FLD(info, &i_s_fts_doc_fields_info),
+	STRUCT_FLD(info, &i_s_info),
 
 	/* plugin name */
 	/* const char* */
@@ -3129,7 +3129,7 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_ft_index_cache =
 
 	/* pointer to type-specific plugin descriptor */
 	/* void* */
-	STRUCT_FLD(info, &i_s_fts_index_fields_info),
+	STRUCT_FLD(info, &i_s_info),
 
 	/* plugin name */
 	/* const char* */
@@ -3429,7 +3429,7 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_ft_index_table =
 
 	/* pointer to type-specific plugin descriptor */
 	/* void* */
-	STRUCT_FLD(info, &i_s_fts_index_fields_info),
+	STRUCT_FLD(info, &i_s_info),
 
 	/* plugin name */
 	/* const char* */
@@ -3628,7 +3628,7 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_ft_config =
 
 	/* pointer to type-specific plugin descriptor */
 	/* void* */
-	STRUCT_FLD(info, &i_s_fts_config_fields_info),
+	STRUCT_FLD(info, &i_s_info),
 
 	/* plugin name */
 	/* const char* */