diff options
| author | unknown <serg@serg.mylan> | 2003-10-14 13:10:41 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-10-14 13:10:41 +0200 |
| commit | 7e01e7ed11c24ccd026a419859a418048e67fdcd (patch) | |
| tree | 67ef098bfcdb660f9a076d0f5196d6f283fcc9d6 /sql/sql_parse.cc | |
| parent | 9bdfdac58a0b319ab34d16bf195d119d1ae683cc (diff) | |
| download | mariadb-git-7e01e7ed11c24ccd026a419859a418048e67fdcd.tar.gz | |
make LOCK TABLES to work when Lock_tables_priv is granted on the DB level and Select_priv is granted on the table level.
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 0c4e3cad763..0d743e1d56e 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2693,7 +2693,7 @@ check_access(THD *thd, ulong want_access, const char *db, ulong *save_priv, /* grant_option is set if there exists a single table or column grant */ if (db_access == want_access || ((grant_option && !dont_check_global_grants) && - !(want_access & ~TABLE_ACLS))) + !(want_access & ~(db_access | TABLE_ACLS)))) DBUG_RETURN(FALSE); /* Ok */ if (!no_errors) net_printf(&thd->net,ER_DBACCESS_DENIED_ERROR, |