diff --git a/include/hash.h b/include/hash.h
index cd7210a290c..9a6d91036e1 100644
--- a/include/hash.h
+++ b/include/hash.h
@@ -47,7 +47,7 @@ my_bool _hash_init(HASH *hash, CHARSET_INFO *charset,
 		   uint key_length, hash_get_key get_key,
 		   void (*free_element)(void*), uint flags CALLER_INFO_PROTO);
 void hash_free(HASH *tree);
-void hash_reset(HASH *hash);
+void my_hash_reset(HASH *hash);
 byte *hash_element(HASH *hash,uint idx);
 gptr hash_search(HASH *info,const byte *key,uint length);
 gptr hash_next(HASH *info,const byte *key,uint length);
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/net_serv.cc b/sql/net_serv.cc
index 55f56645f82..bd3bbe3e1a9 100644
--- a/sql/net_serv.cc
+++ b/sql/net_serv.cc
@@ -255,7 +255,7 @@ my_bool
 my_net_write(NET *net,const char *packet,ulong len)
 {
   uchar buff[NET_HEADER_SIZE];
-  if (unlikely(!net->vio)) // nowhere to write
+  if (unlikely(!net->vio))                      /* nowhere to write */
     return 0;
   /*
     Big packets are handled by splitting them in packets of MAX_PACKET_LENGTH
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 976c6789d9f..033f5674d34 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -742,8 +742,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;
   }