From 7f1777af8802178d68d0e0193e859f80449bb98c Mon Sep 17 00:00:00 2001 From: Eugene Kosov Date: Fri, 22 Dec 2017 14:31:04 +0300 Subject: SQL: DELETE HISTORY error message in prepared statements [#387] --- sql/sql_delete.cc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'sql/sql_delete.cc') diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 42ff093ce0a..f2e6061d885 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -942,10 +942,15 @@ l select_lex->leaf_tables, FALSE, DELETE_ACL, SELECT_ACL, TRUE)) DBUG_RETURN(TRUE); - if (table_list->vers_conditions && - select_lex->vers_setup_conds(thd, table_list, conds)) + if (table_list->vers_conditions) { - 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)) || setup_fields(thd, Ref_ptr_array(), -- cgit v1.2.1