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-10-29 15:24:38 +01:00
parent db3be9b434 f00711bba2
commit 3d0fb15028
655 changed files with 8060 additions and 3541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_partition.cc
View File

@@ -141,7 +141,7 @@ Item* convert_charset_partition_constant(Item *item, CHARSET_INFO *cs)
item= item->safe_charset_converter(thd, cs);
context->table_list= NULL;
thd->where= THD_WHERE::CONVERT_CHARSET_CONST;
thd->where= THD_WHERE::VALUES_CLAUSE;
if (item && item->fix_fields_if_needed(thd, (Item**)NULL))
item= NULL;
thd->where= save_where;