diff options
| author | monty@donna.mysql.com <> | 2000-08-15 20:09:37 +0300 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2000-08-15 20:09:37 +0300 |
| commit | ea013c2152301e459504451efdb17f4c9bb30877 (patch) | |
| tree | 5f72e7444fbc3c8d944a66b54b26550a04e4f0be /sql/mini_client.cc | |
| parent | 807460bbceceec25bf97352bc5e232c3e766d70f (diff) | |
| download | mariadb-git-ea013c2152301e459504451efdb17f4c9bb30877.tar.gz | |
Fixed for Ia64 + delayed key creation + a lot of small bug fixes
Diffstat (limited to 'sql/mini_client.cc')
| -rw-r--r-- | sql/mini_client.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mini_client.cc b/sql/mini_client.cc index 49433bdf96a..c0e6b3c3cbe 100644 --- a/sql/mini_client.cc +++ b/sql/mini_client.cc @@ -231,7 +231,7 @@ static int mc_sock_connect(File s, const struct sockaddr *name, uint namelen, ui return connect(s, (struct sockaddr*) name, namelen); #else int flags, res, s_err; - size_socket s_err_size = sizeof(uint); + socklen_t s_err_size = sizeof(uint); fd_set sfds; struct timeval tv; @@ -500,7 +500,7 @@ mc_mysql_connect(MYSQL *mysql,const char *host, const char *user, UNIXaddr.sun_family = AF_UNIX; strmov(UNIXaddr.sun_path, unix_socket); if (mc_sock_connect(sock,(struct sockaddr *) &UNIXaddr, sizeof(UNIXaddr), - mysql->options.connect_timeout) <0) + mysql->options.connect_timeout) <0) { DBUG_PRINT("error",("Got error %d on connect to local server",ERRNO)); net->last_errno=CR_CONNECTION_ERROR; |