Commit e9f6c47f authored by Sergey Vojtovich's avatar Sergey Vojtovich

MDEV-4786 - merge 10.0-monty - 10.0

Fixed "check of testcases" failure.

Value of INFORMATION_SCHEMA.PLUGINS.PLUGIN_TYPE_VERSION was
pointing to incorrect address and could change after server
restart.

storage/innobase/handler/i_s.cc:
  Use proper plugin info pointer (struct st_mysql_information_schema
  instead of ST_FIELD_INFO[]).
parent 9dd68da1
...@@ -2858,7 +2858,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_ft_default_stopword = ...@@ -2858,7 +2858,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_ft_default_stopword =
/* pointer to type-specific plugin descriptor */ /* pointer to type-specific plugin descriptor */
/* void* */ /* void* */
STRUCT_FLD(info, &i_s_stopword_fields_info), STRUCT_FLD(info, &i_s_info),
/* plugin name */ /* plugin name */
/* const char* */ /* const char* */
...@@ -3027,7 +3027,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_ft_deleted = ...@@ -3027,7 +3027,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_ft_deleted =
/* pointer to type-specific plugin descriptor */ /* pointer to type-specific plugin descriptor */
/* void* */ /* void* */
STRUCT_FLD(info, &i_s_fts_doc_fields_info), STRUCT_FLD(info, &i_s_info),
/* plugin name */ /* plugin name */
/* const char* */ /* const char* */
...@@ -3110,7 +3110,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_ft_being_deleted = ...@@ -3110,7 +3110,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_ft_being_deleted =
/* pointer to type-specific plugin descriptor */ /* pointer to type-specific plugin descriptor */
/* void* */ /* void* */
STRUCT_FLD(info, &i_s_fts_doc_fields_info), STRUCT_FLD(info, &i_s_info),
/* plugin name */ /* plugin name */
/* const char* */ /* const char* */
...@@ -3243,7 +3243,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_ft_inserted = ...@@ -3243,7 +3243,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_ft_inserted =
/* pointer to type-specific plugin descriptor */ /* pointer to type-specific plugin descriptor */
/* void* */ /* void* */
STRUCT_FLD(info, &i_s_fts_doc_fields_info), STRUCT_FLD(info, &i_s_info),
/* plugin name */ /* plugin name */
/* const char* */ /* const char* */
...@@ -3506,7 +3506,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_ft_index_cache = ...@@ -3506,7 +3506,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_ft_index_cache =
/* pointer to type-specific plugin descriptor */ /* pointer to type-specific plugin descriptor */
/* void* */ /* void* */
STRUCT_FLD(info, &i_s_fts_index_fields_info), STRUCT_FLD(info, &i_s_info),
/* plugin name */ /* plugin name */
/* const char* */ /* const char* */
...@@ -3807,7 +3807,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_ft_index_table = ...@@ -3807,7 +3807,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_ft_index_table =
/* pointer to type-specific plugin descriptor */ /* pointer to type-specific plugin descriptor */
/* void* */ /* void* */
STRUCT_FLD(info, &i_s_fts_index_fields_info), STRUCT_FLD(info, &i_s_info),
/* plugin name */ /* plugin name */
/* const char* */ /* const char* */
...@@ -4007,7 +4007,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_ft_config = ...@@ -4007,7 +4007,7 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_ft_config =
/* pointer to type-specific plugin descriptor */ /* pointer to type-specific plugin descriptor */
/* void* */ /* void* */
STRUCT_FLD(info, &i_s_fts_config_fields_info), STRUCT_FLD(info, &i_s_info),
/* plugin name */ /* plugin name */
/* const char* */ /* const char* */
......
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