diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index f0b370c23d7..46370949650 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -1878,8 +1878,9 @@ insert_fields(THD *thd,TABLE_LIST *tables, const char *db_name,
   for (; tables ; tables=tables->next)
   {
     TABLE *table=tables->table;
-    if (grant_option && !thd->master_access &&
-	check_grant_all_columns(thd,SELECT_ACL,table) )
+    if (grant_option && !(table->grant.privilege &
+			  table->grant.want_privilege) &&
+	check_grant_all_columns(thd,SELECT_ACL,table))
       DBUG_RETURN(-1);
     if (!table_name || (!strcmp(table_name,tables->alias) &&
 			(!db_name || !tables->db ||