Commit 4801c2e6 authored by unknown's avatar unknown
Browse files

A fix for linking failure of MySQL client when linking with imap libraries 

(Bug#7428) (renamed: hash_reset -> my_hash_reset)


mysys/hash.c:
  renamed: hash_reset -> my_hash_reset
sql/sql_class.h:
  hash_reset -> my_hash_reset
parent fe8c6a4a

mysys/hash.c

+3 −3
Original line number Diff line number Diff line
@@ -122,13 +122,13 @@ void hash_free(HASH *hash) 
  Delete all elements from the hash (the hash itself is to be reused).



  SYNOPSIS

    hash_reset()

    my_hash_reset()

    hash   the hash to delete elements of

*/



void hash_reset(HASH *hash)

void my_hash_reset(HASH *hash)

{

  DBUG_ENTER("hash_reset");

  DBUG_ENTER("my_hash_reset");

  DBUG_PRINT("enter",("hash: 0x%lxd",hash));



  hash_free_elements(hash);

sql/sql_class.h

+2 −2
Original line number Diff line number Diff line
@@ -648,8 +648,8 @@ class Statement_map 
  /* Erase all statements (calls Statement destructor) */

  void reset()

  {

    hash_reset(&names_hash);

    hash_reset(&st_hash);

    my_hash_reset(&names_hash);

    my_hash_reset(&st_hash);

    last_found_statement= 0;

  }