From e3bf73c1fe39fa88efba4233c1cc20fec56e2f5e Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 29 Aug 2000 12:31:01 +0300 Subject: Bug fixes for 3.23.23 myisam/mi_debug.c: ***MISSING WEAVE*** Docs/internals.texi: Added coding guidelines Docs/manual.texi: Changelog update + Win32 -> Windows client/mysql.cc: Changed --no-named-commands to be on by default client/mysqlimport.c: Bug fix include/config-win.h: Update of supported functions include/global.h: Removed compiler warning libmysql/libmysql.c: Fix for Ia64 myisam/ChangeLog: Changelog myisam/Makefile.am: Added file mi_dbug.c myisam/ft_stopwords.c: Fix for Ia64 myisam/mi_delete_table.c: Extra debugging myisam/mi_rename.c: Extra debugging myisam/mi_rnext.c: Fixed bug with MIN and concurrent insert myisam/mi_rprev.c: Fixed bug with MAX and concurrent insert myisam/mi_search.c: Fixed bug with DECIMAL/NUMERIC keys myisam/myisamdef.h: Extra debugging scripts/make_binary_distribution.sh: Added thread safe mysql library sql/ha_heap.cc: Fix of HEAP bug with range keys sql/ha_heap.h: Fix of HEAP bug with range keys sql/handler.cc: Optimizing sql/handler.h: Optimizing sql/lock.cc: More DEBUG + fix of RENAME bug sql/mini_client.cc: Fix for Ia64 sql/mysql_priv.h: Fix for name locks sql/mysqld.cc: Shorter message if wrong options sql/opt_range.cc: Added TODO sql/sql_base.cc: Fix for DROP TABLE sql/sql_parse.cc: Fix of permission checking for CHECK TABLE sql/sql_select.cc: Fix of using LEFT JOIN with empty table sql/table.h: Fix for name locks tests/fork_test.pl: Fixed typo --- sql/mini_client.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sql/mini_client.cc') diff --git a/sql/mini_client.cc b/sql/mini_client.cc index b9e66911475..90024f1ff47 100644 --- a/sql/mini_client.cc +++ b/sql/mini_client.cc @@ -225,7 +225,8 @@ static void mc_free_old_query(MYSQL *mysql) * Base version coded by Steve Bernacki, Jr. *****************************************************************************/ -static int mc_sock_connect(File s, const struct sockaddr *name, uint namelen, uint to) +static int mc_sock_connect(my_socket s, const struct sockaddr *name, + uint namelen, uint to) { #if defined(__WIN__) return connect(s, (struct sockaddr*) name, namelen); @@ -451,7 +452,7 @@ mc_mysql_connect(MYSQL *mysql,const char *host, const char *user, uint port, const char *unix_socket,uint client_flag) { char buff[100],*end,*host_info; - int sock; + my_socket sock; ulong ip_addr; struct sockaddr_in sock_addr; uint pkt_length; -- cgit v1.2.1