database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.11' into 11.0

Browse Source
This commit is contained in:
Sergei Golubchik
2024-05-11 13:23:27 +02:00
parent fc670b46bd 3a06964468
commit f9807aadef
820 changed files with 18746 additions and 6295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_show.cc
View File

@@ -9660,7 +9660,7 @@ ST_FIELD_INFO stat_fields_info[]=
Column("PACKED", Varchar(10), NULLABLE, "Packed", OPEN_FRM_ONLY),
Column("NULLABLE", Varchar(3), NOT_NULL, "Null", OPEN_FRM_ONLY),
Column("INDEX_TYPE", Varchar(16), NOT_NULL, "Index_type", OPEN_FULL_TABLE),
Column("COMMENT", Varchar(16), NULLABLE, "Comment", OPEN_FRM_ONLY),
Column("COMMENT", Varchar(16), NULLABLE, "Comment", OPEN_FULL_TABLE),
Column("INDEX_COMMENT", Varchar(INDEX_COMMENT_MAXLEN),
NOT_NULL, "Index_comment",OPEN_FRM_ONLY),
Column("IGNORED", Varchar(3), NOT_NULL, "Ignored", OPEN_FRM_ONLY),
@@ -10269,6 +10269,7 @@ ST_SCHEMA_TABLE schema_tables[]=
int initialize_schema_table(st_plugin_int *plugin)
{
ST_SCHEMA_TABLE *schema_table;
int err;
DBUG_ENTER("initialize_schema_table");
if (!(schema_table= (ST_SCHEMA_TABLE *)my_malloc(key_memory_ST_SCHEMA_TABLE,
@@ -10285,12 +10286,15 @@ int initialize_schema_table(st_plugin_int *plugin)
/* Make the name available to the init() function. */
schema_table->table_name= plugin->name.str;
if (plugin->plugin->init(schema_table))
if ((err= plugin->plugin->init(schema_table)))
{
sql_print_error("Plugin '%s' init function returned error.",
plugin->name.str);
if (err != HA_ERR_RETRY_INIT)
sql_print_error("Plugin '%s' init function returned error.",
plugin->name.str);
plugin->data= NULL;
my_free(schema_table);
if (err == HA_ERR_RETRY_INIT)
DBUG_RETURN(err);
DBUG_RETURN(1);
}