diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2017-08-11 10:58:23 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2017-08-11 10:58:23 +0400 |
| commit | 1a9e13d622382285d979e75774bdd1dde1660e2d (patch) | |
| tree | b0da321b46551da1a75b2a6aa0c7b89afa5ce0d0 /sql/sql_derived.cc | |
| parent | 837aa57fb2dcb2f487494181c43dbcfeb61af64f (diff) | |
| parent | 79d28533549d15e848b342cf518ae4b409ba3e64 (diff) | |
| download | mariadb-git-1a9e13d622382285d979e75774bdd1dde1660e2d.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
sql/item_cmpfunc.cc
storage/innobase/buf/buf0flu.cc
storage/innobase/include/ut0stage.h
storage/innobase/row/row0upd.cc
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 56909364f2a..c278c5d5aa9 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -823,13 +823,14 @@ exit: table->derived_select_number= first_select->select_number; table->s->tmp_table= INTERNAL_TMP_TABLE; #ifndef NO_EMBEDDED_ACCESS_CHECKS - if (derived->referencing_view) + if (derived->is_view()) table->grant= derived->grant; else { + DBUG_ASSERT(derived->is_derived()); + DBUG_ASSERT(derived->is_anonymous_derived_table()); table->grant.privilege= SELECT_ACL; - if (derived->is_derived()) - derived->grant.privilege= SELECT_ACL; + derived->grant.privilege= SELECT_ACL; } #endif /* Add new temporary table to list of open derived tables */ |