diff options
| author | monty@donna.mysql.com <> | 2000-08-29 12:31:01 +0300 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2000-08-29 12:31:01 +0300 |
| commit | 066d55c0c09d589d17bf466682134af50cb59e14 (patch) | |
| tree | 8c9e3c031400ac400edcf6561fe51f4bdbd69369 /sql/mini_client.cc | |
| parent | d564acf14eb07cefedf0218c90fd109c61dc6e2f (diff) | |
| download | mariadb-git-066d55c0c09d589d17bf466682134af50cb59e14.tar.gz | |
Bug fixes for 3.23.23
Diffstat (limited to 'sql/mini_client.cc')
| -rw-r--r-- | sql/mini_client.cc | 5 |
1 files changed, 3 insertions, 2 deletions
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. <steve@navinet.net> *****************************************************************************/ -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; |