Merge sinisa@work.mysql.com:/home/bk/mysql-4.0

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0

Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
df467434 · Sinisa@sinisa.nasamreza.org · 75868399 · 30a00680 · df467434
Commit df467434 authored May 18, 2002 by Sinisa@sinisa.nasamreza.org
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/sql_parse.cc sql/sql_parse.cc +2 -1

No files found.
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2225,7 +2225,8 @@ mysql_execute_command(void)
    }
    if (check_db_used(thd,tables) || end_active_trans(thd))
      goto error;
-    if (grant_option && check_grant(thd,SELECT_ACL | INSERT_ACL | UPDATE_ACL | DELETE_ACL,tables))
+    if (check_table_access(thd, SELECT_ACL | INSERT_ACL | UPDATE_ACL | DELETE_ACL , tables) 
+	|| (grant_option && check_grant(thd,SELECT_ACL | INSERT_ACL | UPDATE_ACL | DELETE_ACL,tables)))
      goto error;
    thd->in_lock_tables=1;
    thd->options|= OPTION_TABLE_LOCK;