database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

MDEV-21147 Assertion `marked_for_read()' upon UPDATE on versioned table via view

Browse Source 
Unit prepare prematurely fixed field which must be fixed via
setup_conds() to correctly update table->covering_keys.

Call vers_setup_conds() directly instead, because actually everything
else is not needed.
This commit is contained in:
Aleksey Midenkov
2019-12-03 15:46:49 +03:00
parent cef2b34f25
commit 477629d2cd
3 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_derived.cc
View File

@ -707,8 +707,15 @@ bool mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *derived)
case SQLCOM_DELETE_MULTI:
case SQLCOM_UPDATE:
case SQLCOM_UPDATE_MULTI:
if ((res= unit->prepare(derived, derived->derived_result, 0)))
if ((res= first_select->vers_setup_conds(thd,
derived->merge_underlying_list)))
goto exit;
if (derived->merge_underlying_list->where)
{
Query_arena_stmt on_stmt_arena(thd);
derived->where= and_items(thd, derived->where,
derived->merge_underlying_list->where);
}
default:
break;
}