Commit 58d4830c authored by unknown's avatar unknown
Browse files

Post-merge fixes. 


sql/sql_acl.cc:
  A post-merge fix.
sql/sql_base.cc:
  A post-merge fix.
parent 3456c4be

sql/sql_acl.cc

+0 −1
Original line number Diff line number Diff line
@@ -2245,7 +2245,6 @@ static GRANT_NAME *name_hash_search(HASH *name_hash, 
  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_first(name_hash, (byte*) helping,

sql/sql_base.cc

+2 −1
Original line number Diff line number Diff line
@@ -1624,7 +1624,8 @@ bool table_is_used(TABLE *table, bool wait_for_name_lock) 
  {

    char *key= table->s->table_cache_key;

    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);

	 search ;

         search= (TABLE*) hash_next(&open_cache, (byte*) key,