database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.0

Browse Source 
into sanja.is.com.ua:/home/bell/mysql/work-qc-4.0


sql/sql_parse.cc:
  Auto merged
This commit is contained in:
unknown
2002-05-18 21:04:30 +03:00
parent 04467af646 f674be5c86
commit ac11ab9ab0
6 changed files with 163 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_parse.cc
View File

@ -2224,7 +2224,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;