diff options
| author | monty@hundin.mysql.fi <> | 2001-07-17 21:04:01 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-07-17 21:04:01 +0300 |
| commit | aecef7614e1c6d131417f2b21d2cddc9199c3ab2 (patch) | |
| tree | f19e7e378a6170f04e3eebee868b77be238b17d7 /sql/sql_acl.cc | |
| parent | 02f72a801b2f29d5c604da72bfcf53c61706ce6f (diff) | |
| download | mariadb-git-aecef7614e1c6d131417f2b21d2cddc9199c3ab2.tar.gz | |
Removed wrong warning from thr_lock
Fixed problem with UPDATE and BDB tables
Fixed problem with GRANT FILE privilege on database level
mysqld --warnings works now
Fixed problem with SHOW OPEN TABLES when not using BDB
Added some tests for ALTER TABLE to the test scripts
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 0f3ee483400..0cca3df0b16 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -1824,10 +1824,9 @@ int mysql_grant (THD *thd, const char *db, List <LEX_USER> &list, uint rights, *Str, (!db ? rights : 0), what))) result= -1; - if (db) - if (( replace_db_table(tables[1].table, db, *Str, rights, - what))) - result= -1; + if (db && replace_db_table(tables[1].table, db, *Str, rights & DB_ACLS, + what)) + result= -1; } VOID(pthread_mutex_unlock(&acl_cache->lock)); pthread_mutex_unlock(&LOCK_grant); |