From 71a2b4f82453f98b6d2f079ea5235546e1879aef Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 11 Jan 2005 13:12:52 +0300 Subject: make it compile with -ansi -pedantic --- sql/net_serv.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql') diff --git a/sql/net_serv.cc b/sql/net_serv.cc index ca82c49b62d..5699b5a2f55 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -251,7 +251,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 -- cgit v1.2.1 From 3aecf631f67f3914d6a5ea5799769c7349a40e63 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 11 Jan 2005 13:53:10 +0300 Subject: 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 --- sql/sql_class.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql') 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; } -- cgit v1.2.1