Merge mysql.com:/home/kostja/work/mysql-4.1-7428

into mysql.com:/home/kostja/work/mysql-5.0-root


sql/net_serv.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

2 files changed, 3 insertions, 3 deletions

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