summaryrefslogtreecommitdiff
path: root/sql/sql_insert.cc
diff options
context:
space:
mode:
authorgkodinov/kgeorge@magare.gmz <>2007-09-27 12:17:16 +0300
committergkodinov/kgeorge@magare.gmz <>2007-09-27 12:17:16 +0300
commitbbe1d370890af16f130f8018272e5f4d19d16eb9 (patch)
tree3bae543b838949f6e7963d29bf63eb88acf56553 /sql/sql_insert.cc
parent4cd18bde81fc0c2f4ccbe8cfdd52ee9f7c2e2e7c (diff)
parentfb3b12176dc9af603284eaeb210e89c301934a98 (diff)
downloadmariadb-git-bbe1d370890af16f130f8018272e5f4d19d16eb9.tar.gz
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B30468-5.0-opt
Diffstat (limited to 'sql/sql_insert.cc')
-rw-r--r--sql/sql_insert.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index d7f935268e4..770bbd1349d 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -189,11 +189,9 @@ static int check_insert_fields(THD *thd, TABLE_LIST *table_list,
#ifndef NO_EMBEDDED_ACCESS_CHECKS
if (grant_option)
{
- Field_iterator_table field_it;
- field_it.set_table(table);
- if (check_grant_all_columns(thd, INSERT_ACL, &table->grant,
- table->s->db, table->s->table_name,
- &field_it))
+ Field_iterator_table_ref field_it;
+ field_it.set(table_list);
+ if (check_grant_all_columns(thd, INSERT_ACL, &field_it))
return -1;
}
#endif