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

SQL: DELETE HISTORY error message in prepared statements [#387]

Browse Source
This commit is contained in:
Eugene Kosov
2017-12-22 14:31:04 +03:00
parent 098a1d7ddb
commit 7f1777af88
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_delete.cc
View File

@ -942,10 +942,15 @@ l
select_lex->leaf_tables, FALSE, select_lex->leaf_tables, FALSE,
DELETE_ACL, SELECT_ACL, TRUE)) DELETE_ACL, SELECT_ACL, TRUE))
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
if (table_list->vers_conditions && if (table_list->vers_conditions)
select_lex->vers_setup_conds(thd, table_list, conds))
{ {
DBUG_RETURN(TRUE); if (table_list->is_view())
{
my_error(ER_VERS_TRUNCATE_VIEW, MYF(0));
DBUG_RETURN(true);
}
if (select_lex->vers_setup_conds(thd, table_list, conds))
DBUG_RETURN(true);
} }
if ((wild_num && setup_wild(thd, table_list, field_list, NULL, wild_num)) || if ((wild_num && setup_wild(thd, table_list, field_list, NULL, wild_num)) ||
setup_fields(thd, Ref_ptr_array(), setup_fields(thd, Ref_ptr_array(),