diff options
| author | unknown <serg@sergbook.mysql.com> | 2004-12-31 11:52:14 +0100 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2004-12-31 11:52:14 +0100 |
| commit | 5eaf65ab4be77911eb03cceefac9ecea48c25f71 (patch) | |
| tree | e4e588771f15003e0c2b5df5cbc1cafeb3530324 /sql/sql_acl.cc | |
| parent | 379613c3e274147f240a25b10eb677e3ee77aa34 (diff) | |
| download | mariadb-git-5eaf65ab4be77911eb03cceefac9ecea48c25f71.tar.gz | |
post-merge
mysql-test/r/grant2.result:
new test case
mysql-test/r/variables.result:
don't fail w/o innodb
mysql-test/t/grant2.test:
new test case
mysql-test/t/multi_update.test:
don't fail w/o innodb
mysql-test/t/variables.test:
don't fail w/o innodb
sql/sql_acl.cc:
cleanup
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 5579aa9b3f5..2c11d1c87ad 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -964,9 +964,8 @@ static void acl_insert_db(const char *user, const char *host, const char *db, ulong acl_get(const char *host, const char *ip, const char *user, const char *db, my_bool db_is_pattern) { - ulong host_access,db_access; + ulong host_access= ~0,db_access= 0; uint i,key_length; - db_access=0; host_access= ~0; char key[ACL_KEY_LENGTH],*tmp_db,*end; acl_entry *entry; DBUG_ENTER("acl_get"); |