Fixing that database privileges are also taken into account.

Before this change LOCK TABLES worked only with global and table level privileges.

Fixing that database privileges are also taken into account.
Before this change LOCK TABLES worked only with global and table level privileges.
30a00680 · Sinisa@sinisa.nasamreza.org · 17bdd9d6 · 30a00680
Commit 30a00680 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
@@ -2223,7 +2223,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;