diff options
author | bell@sanja.is.com.ua <> | 2005-10-28 00:18:23 +0300 |
---|---|---|
committer | bell@sanja.is.com.ua <> | 2005-10-28 00:18:23 +0300 |
commit | 1b164c7b83f7081acc99f877d2b7fbfbdedbec2f (patch) | |
tree | 921242ccda92f66e2ac8bfc607ba0dcb1f172286 /sql/sql_delete.cc | |
parent | bee76b78a248c5fe998bb6f6c8921e2c709be114 (diff) | |
download | mariadb-git-1b164c7b83f7081acc99f877d2b7fbfbdedbec2f.tar.gz |
support of view underlying tables and SP functions security check added (BUG#9505) (WL#2787)
Diffstat (limited to 'sql/sql_delete.cc')
-rw-r--r-- | sql/sql_delete.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 83f50ba3ac5..efc51126467 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -414,8 +414,9 @@ bool mysql_multi_delete_prepare(THD *thd) if (!(target_tbl->table= target_tbl->correspondent_table->table)) { DBUG_ASSERT(target_tbl->correspondent_table->view && - target_tbl->correspondent_table->ancestor && - target_tbl->correspondent_table->ancestor->next_local); + target_tbl->correspondent_table->merge_underlying_list && + target_tbl->correspondent_table->merge_underlying_list-> + next_local); my_error(ER_VIEW_DELETE_MERGE_VIEW, MYF(0), target_tbl->correspondent_table->view_db.str, target_tbl->correspondent_table->view_name.str); |