database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.4' into 10.5

Browse Source
This commit is contained in:
Sergei Golubchik
2023-12-01 13:43:58 +01:00
parent c6a9fd7904 5f89045221
commit 98a39b0c91
511 changed files with 26233 additions and 3853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_show.cc
View File

@ -2748,7 +2748,7 @@ static const char *thread_state_info(THD *tmp)
if (cond)
return "Waiting on cond";
}
return NULL;
return "";
}
@ -8629,9 +8629,9 @@ int mysql_schema_table(THD *thd, LEX *lex, TABLE_LIST *table_list)
}
List_iterator_fast<Item> it(sel->item_list);
if (!(transl=
(Field_translator*)(thd->stmt_arena->
(Field_translator*)(thd->active_stmt_arena_to_use()->
alloc(sel->item_list.elements *
sizeof(Field_translator)))))
sizeof(Field_translator))))) // ???
{
DBUG_RETURN(1);
}
@ -9586,7 +9586,7 @@ ST_FIELD_INFO partitions_fields_info[]=
ST_FIELD_INFO variables_fields_info[]=
{
Column("VARIABLE_NAME", Varchar(64), NOT_NULL, "Variable_name"),
Column("VARIABLE_VALUE", Varchar(2048), NOT_NULL, "Value"),
Column("VARIABLE_VALUE", Varchar(4096), NOT_NULL, "Value"),
CEnd()
};