database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Post-merge fixes.

Browse Source
This commit is contained in:
konstantin@mysql.com
2006-01-04 21:39:39 +03:00
parent 6502e6bba7
commit 4a4b8eacc1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_acl.cc
View File

@ -2245,7 +2245,6 @@ static GRANT_NAME *name_hash_search(HASH *name_hash,
uint len; uint len;
GRANT_NAME *grant_name,*found=0; GRANT_NAME *grant_name,*found=0;
HASH_SEARCH_STATE state; HASH_SEARCH_STATE state;
GRANT_TABLE *grant_table,*found=0;
len = (uint) (strmov(strmov(strmov(helping,user)+1,db)+1,tname)-helping)+ 1; len = (uint) (strmov(strmov(strmov(helping,user)+1,db)+1,tname)-helping)+ 1;
for (grant_name= (GRANT_NAME*) hash_first(name_hash, (byte*) helping, for (grant_name= (GRANT_NAME*) hash_first(name_hash, (byte*) helping,

3
sql/sql_base.cc
View File

@ -1624,7 +1624,8 @@ bool table_is_used(TABLE *table, bool wait_for_name_lock)
{ {
char *key= table->s->table_cache_key; char *key= table->s->table_cache_key;
uint key_length= table->s->key_length; uint key_length= table->s->key_length;
for (TABLE *search= (TABLE*) hash_search(&open_cache, (byte*) key, HASH_SEARCH_STATE state;
for (TABLE *search= (TABLE*) hash_first(&open_cache, (byte*) key,
key_length, &state); key_length, &state);
search ; search ;
search= (TABLE*) hash_next(&open_cache, (byte*) key, search= (TABLE*) hash_next(&open_cache, (byte*) key,