diff options
author | Ignacio Galarza <iggy@mysql.com> | 2009-03-19 09:44:58 -0400 |
---|---|---|
committer | Ignacio Galarza <iggy@mysql.com> | 2009-03-19 09:44:58 -0400 |
commit | e82390130e939b94896295a19a571645ff961908 (patch) | |
tree | 0d1697348f5ffacdf22ddce0537910d41d6482f0 /sql/sql_base.cc | |
parent | 2b85c64d65385297f4a90265ae47cb298891dd5f (diff) | |
parent | 718efce059715449722c7dbcf8ae7a6698d1ccfb (diff) | |
download | mariadb-git-e82390130e939b94896295a19a571645ff961908.tar.gz |
auto-merge
Diffstat (limited to 'sql/sql_base.cc')
-rw-r--r-- | sql/sql_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 812c060fe15..0cf3e023be9 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -5479,7 +5479,7 @@ insert_fields(THD *thd, Name_resolution_context *context, const char *db_name, #ifndef NO_EMBEDDED_ACCESS_CHECKS /* Ensure that we have access rights to all fields to be inserted. */ - if (!((table && (table->grant.privilege & SELECT_ACL) || + if (!((table && !tables->view && (table->grant.privilege & SELECT_ACL) || tables->view && (tables->grant.privilege & SELECT_ACL))) && !any_privileges) { |