diff options
| author | Eugene Kosov <claprix@yandex.ru> | 2017-12-22 14:31:04 +0300 |
|---|---|---|
| committer | Eugene Kosov <claprix@yandex.ru> | 2017-12-22 14:31:04 +0300 |
| commit | 7f1777af8802178d68d0e0193e859f80449bb98c (patch) | |
| tree | c15c91c6ab4733aba72f646a9f2a9ef0433910af /sql/sql_delete.cc | |
| parent | 098a1d7ddbf7756b69e5cee39782d0090e022b82 (diff) | |
| download | mariadb-git-7f1777af8802178d68d0e0193e859f80449bb98c.tar.gz | |
SQL: DELETE HISTORY error message in prepared statements [#387]
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 11 |
1 files changed, 8 insertions, 3 deletions
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(), |