From d30409959ea71aed0e04b04c18573ba1e1c163a6 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 18 May 2002 14:30:54 +0300 Subject: [PATCH] Fixing that database privileges are also taken into account. Before this change LOCK TABLES worked only with global and table level privileges. --- sql/sql_parse.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index af68c1bb9f3..3ffc5edc69f 100644 --- 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;