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

MDEV-34679 ER_BAD_FIELD uses non-localizable substrings

Browse Source
This commit is contained in:
Sergei Golubchik
2024-07-18 15:20:42 +02:00
parent 99178311ac
commit 3a1cf2c85b
349 changed files with 1218 additions and 1796 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_update.cc
View File

@ -500,8 +500,9 @@ int mysql_update(THD *thd,
if (table_list->is_view())
unfix_fields(fields);
if (setup_fields_with_no_wrap(thd, Ref_ptr_array(),
fields, MARK_COLUMNS_WRITE, 0, 0))
;
if (setup_fields_with_no_wrap(thd, Ref_ptr_array(), fields,
MARK_COLUMNS_WRITE, 0, 0, THD_WHERE::SET_LIST))
DBUG_RETURN(1); /* purecov: inspected */
if (check_fields(thd, table_list, fields, table_list->view))
{
@ -522,7 +523,8 @@ int mysql_update(THD *thd,
table_list->grant.want_privilege= table->grant.want_privilege=
(SELECT_ACL & ~table->grant.privilege);
#endif
if (setup_fields(thd, Ref_ptr_array(), values, MARK_COLUMNS_READ, 0, NULL, 0))
if (setup_fields(thd, Ref_ptr_array(), values, MARK_COLUMNS_READ, 0, NULL, 0,
THD_WHERE::SET_LIST))
{
free_underlaid_joins(thd, select_lex);
DBUG_RETURN(1); /* purecov: inspected */
@ -1774,8 +1776,8 @@ bool Multiupdate_prelocking_strategy::handle_end(THD *thd)
DBUG_RETURN(1);
List<Item> *fields= &lex->first_select_lex()->item_list;
if (setup_fields_with_no_wrap(thd, Ref_ptr_array(),
*fields, MARK_COLUMNS_WRITE, 0, 0))
if (setup_fields_with_no_wrap(thd, Ref_ptr_array(), *fields,
MARK_COLUMNS_WRITE, 0, 0, THD_WHERE::SET_LIST))
DBUG_RETURN(1);
// Check if we have a view in the list ...