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.11' into 11.2

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-10-29 16:39:47 +01:00
parent 52723ec09a 3d0fb15028
commit 69d033d165
660 changed files with 8148 additions and 3604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_update.cc
View File

@ -467,6 +467,7 @@ bool Sql_cmd_update::update_single_table(THD *thd)
{
thd->lex->current_select->save_leaf_tables(thd);
thd->lex->current_select->leaf_tables_saved= true;
thd->lex->current_select->first_cond_optimization= 0;
}
my_ok(thd); // No matching records
@ -507,6 +508,7 @@ bool Sql_cmd_update::update_single_table(THD *thd)
{
thd->lex->current_select->save_leaf_tables(thd);
thd->lex->current_select->leaf_tables_saved= true;
thd->lex->current_select->first_cond_optimization= 0;
}
my_ok(thd); // No matching records
@ -1287,6 +1289,7 @@ update_end:
{
thd->lex->current_select->save_leaf_tables(thd);
thd->lex->current_select->leaf_tables_saved= true;
thd->lex->current_select->first_cond_optimization= 0;
}
((multi_update *)result)->set_found(found);
((multi_update *)result)->set_updated(updated);
@ -1609,8 +1612,8 @@ bool Multiupdate_prelocking_strategy::handle_end(THD *thd)
DBUG_RETURN(true);
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 ...