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

Merge branch '10.8' into 10.9

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-08-09 09:57:13 +02:00
parent bfdc4ff22e 75d631f333
commit 22d455612b
574 changed files with 10533 additions and 4208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_update.cc
View File

@ -523,7 +523,8 @@ int mysql_update(THD *thd,
DBUG_RETURN(1); /* purecov: inspected */
}
if (table_list->table->check_assignability_explicit_fields(fields, values))
if (table_list->table->check_assignability_explicit_fields(fields, values,
ignore))
DBUG_RETURN(true);
if (check_unique_table(thd, table_list))
@ -2093,7 +2094,8 @@ int multi_update::prepare(List<Item> &not_used_values,
int error= setup_fields(thd, Ref_ptr_array(),
*values, MARK_COLUMNS_READ, 0, NULL, 0) ||
TABLE::check_assignability_explicit_fields(*fields, *values);
TABLE::check_assignability_explicit_fields(*fields, *values,
ignore);
ti.rewind();
while ((table_ref= ti++))