From 067d13f63244957241b34556e72883ebe9c6ac1c Mon Sep 17 00:00:00 2001
From: "konstantin@mysql.com" <>
Date: Tue, 11 Jan 2005 13:53:10 +0300
Subject: [PATCH] A fix for linking failure of MySQL client when linking with
 imap libraries (Bug#7428) (renamed: hash_reset -> my_hash_reset)

---
 mysys/hash.c    | 6 +++---
 sql/sql_class.h | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mysys/hash.c b/mysys/hash.c
index 451bc1eb7f5..6091ef39a4e 100644
--- a/mysys/hash.c
+++ b/mysys/hash.c
@@ -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);
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 169835f3324..7978aec8f1d 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -648,8 +648,8 @@ public:
   /* 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;
   }