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 10.3 into 10.4

Browse Source
This commit is contained in:
Aleksey Midenkov
2019-12-02 12:51:53 +03:00
parent 1d46923a0f db32d9457e
commit 0b8b11b0b1
18 changed files with 278 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sql/sql_update.cc
View File

@ -206,10 +206,10 @@ static bool check_fields(THD *thd, TABLE_LIST *table, List<Item> &items,
return FALSE;
}
static bool check_has_vers_fields(TABLE *table, List<Item> &items)
bool TABLE::vers_check_update(List<Item> &items)
{
List_iterator<Item> it(items);
if (!table->versioned())
if (!versioned_write())
return false;
while (Item *item= it++)
@ -217,8 +217,11 @@ static bool check_has_vers_fields(TABLE *table, List<Item> &items)
if (Item_field *item_field= item->field_for_view_update())
{
Field *field= item_field->field;
if (field->table == table && !field->vers_update_unversioned())
if (field->table == this && !field->vers_update_unversioned())
{
no_cache= true;
return true;
}
}
}
return false;
@ -481,7 +484,7 @@ int mysql_update(THD *thd,
{
DBUG_RETURN(1);
}
bool has_vers_fields= check_has_vers_fields(table, fields);
bool has_vers_fields= table->vers_check_update(fields);
if (check_key_in_view(thd, table_list))
{
my_error(ER_NON_UPDATABLE_TABLE, MYF(0), table_list->alias.str, "UPDATE");
@ -2254,7 +2257,7 @@ multi_update::initialize_tables(JOIN *join)
if (safe_update_on_fly(thd, join->join_tab, table_ref, all_tables))
{
table_to_update= table; // Update table on the fly
has_vers_fields= check_has_vers_fields(table, *fields);
has_vers_fields= table->vers_check_update(*fields);
continue;
}
}
@ -2723,7 +2726,7 @@ int multi_update::do_updates()
if (table->vfield)
empty_record(table);
has_vers_fields= check_has_vers_fields(table, *fields);
has_vers_fields= table->vers_check_update(*fields);
check_opt_it.rewind();
while(TABLE *tbl= check_opt_it++)