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

MDEV-4786 - merge 10.0-monty - 10.0

Browse source 
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[]).
This commit is contained in:
Sergey Vojtovich 2013-07-31 14:55:54 +04:00
parent 9dd68da1b0
commit e9f6c47f26
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
storage/innobase/handler/i_s.cc
View file

@ -2858,7 +2858,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* */
@ -3027,7 +3027,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* */
@ -3110,7 +3110,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* */
@ -3243,7 +3243,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* */
@ -3506,7 +3506,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* */
@ -3807,7 +3807,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* */
@ -4007,7 +4007,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* */