summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2003-03-13 16:43:43 +0200
committerunknown <monty@mashka.mysql.fi>2003-03-13 16:43:43 +0200
commitf3eb7fe0c3259b001f77c30844f42f96562c23f1 (patch)
treed43ad5953e51872d781cba2e6dd77912dfa42de9 /sql
parentc7551b88408430007ed7c27ed5e9f40f584e29d0 (diff)
downloadmariadb-git-f3eb7fe0c3259b001f77c30844f42f96562c23f1.tar.gz
Better fix for GRANT bug
tests/grant.pl: More options for test tests/grant.res: new test results
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_base.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 1ed0673f4cf..f0b370c23d7 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -1644,7 +1644,8 @@ find_field_in_tables(THD *thd,Item_field *item,TABLE_LIST *tables)
found_table=1;
Field *find=find_field_in_table(thd,tables->table,name,length,
grant_option &&
- tables->grant.want_privilege ,1);
+ tables->table->grant.want_privilege,
+ 1);
if (find)
{
if (find == WRONG_GRANT)
@@ -1683,7 +1684,9 @@ find_field_in_tables(THD *thd,Item_field *item,TABLE_LIST *tables)
for (; tables ; tables=tables->next)
{
Field *field=find_field_in_table(thd,tables->table,name,length,
- grant_option && tables->grant.want_privilege ,allow_rowid);
+ grant_option &&
+ tables->table->grant.want_privilege,
+ allow_rowid);
if (field)
{
if (field == WRONG_GRANT)