summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
diff options
context:
space:
mode:
authorIgnacio Galarza <iggy@mysql.com>2009-03-19 09:44:58 -0400
committerIgnacio Galarza <iggy@mysql.com>2009-03-19 09:44:58 -0400
commit675c3ce2bbe7f033930822dd0ef9126ebb25d44b (patch)
tree0d1697348f5ffacdf22ddce0537910d41d6482f0 /sql/sql_base.cc
parent54fbbf9591e21cda9f7b26c2d795d88f51827f07 (diff)
parent0d18d930aed47ed97ef3309f9510cfd7a366202e (diff)
downloadmariadb-git-675c3ce2bbe7f033930822dd0ef9126ebb25d44b.tar.gz
auto-merge
Diffstat (limited to 'sql/sql_base.cc')
-rw-r--r--sql/sql_base.cc2
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)
{