diff options
| author | unknown <konstantin@mysql.com> | 2006-01-04 17:49:45 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-01-04 17:49:45 +0300 |
| commit | 3456c4be3acf92c2ec54dc2551e4e2a02e95512a (patch) | |
| tree | d0ba85a749cfceb9ceb00a014db23734e8656646 /sql/sql_acl.cc | |
| parent | 314f0fbf32d33baab1d43de180892a274f46992d (diff) | |
| parent | f577d864cdac14d9a5cf7714b3506bab7688b1c7 (diff) | |
| download | mariadb-git-3456c4be3acf92c2ec54dc2551e4e2a02e95512a.tar.gz | |
Merge mysql.com:/opt/local/work/mysql-4.1-7209-new
into mysql.com:/opt/local/work/mysql-5.0-merge
mysys/hash.c:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
Auto merged
sql/lock.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_acl.cc:
Manual merge.
sql/sql_base.cc:
Manual merge.
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 110b529fffc..22fecda2599 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -2244,14 +2244,15 @@ static GRANT_NAME *name_hash_search(HASH *name_hash, char helping [NAME_LEN*2+USERNAME_LENGTH+3]; uint len; GRANT_NAME *grant_name,*found=0; + HASH_SEARCH_STATE state; + GRANT_TABLE *grant_table,*found=0; len = (uint) (strmov(strmov(strmov(helping,user)+1,db)+1,tname)-helping)+ 1; - for (grant_name=(GRANT_NAME*) hash_search(name_hash, - (byte*) helping, - len) ; + for (grant_name= (GRANT_NAME*) hash_first(name_hash, (byte*) helping, + len, &state); grant_name ; grant_name= (GRANT_NAME*) hash_next(name_hash,(byte*) helping, - len)) + len, &state)) { if (exact) { |