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.6' into 10.11

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-07-20 08:16:24 +02:00
parent 0f6f1114d4 a938503cfb
commit 0fe39d368a
362 changed files with 7658 additions and 3804 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_partition.cc
View File

@@ -137,11 +137,11 @@ Item* convert_charset_partition_constant(Item *item, CHARSET_INFO *cs)
THD *thd= current_thd;
Name_resolution_context *context= &thd->lex->current_select->context;
TABLE_LIST *save_list= context->table_list;
const char *save_where= thd->where;
THD_WHERE save_where= thd->where;
item= item->safe_charset_converter(thd, cs);
context->table_list= NULL;
thd->where= "convert character set partition constant";
thd->where= THD_WHERE::CONVERT_CHARSET_CONST;
if (item && item->fix_fields_if_needed(thd, (Item**)NULL))
item= NULL;
thd->where= save_where;
@@ -836,7 +836,7 @@ static bool fix_fields_part_func(THD *thd, Item* func_expr, TABLE *table,
func_expr->walk(&Item::change_context_processor, 0,
&lex.first_select_lex()->context);
thd->where= "partition function";
thd->where= THD_WHERE::PARTITION_FUNCTION;
/*
In execution we must avoid the use of thd->change_item_tree since
we might release memory before statement is completed. We do this