diff options
| author | unknown <tim@cane.mysql.fi> | 2000-12-21 12:00:09 +0200 |
|---|---|---|
| committer | unknown <tim@cane.mysql.fi> | 2000-12-21 12:00:09 +0200 |
| commit | a09659dd577dcf4c9ff907c680df0abf011d047c (patch) | |
| tree | 0fcc294e65f2ac0aa26f05054339eb7a5a9b040a /sql | |
| parent | a9db7b74980cd4644fe2ee04e3d99bdaeed2072b (diff) | |
| parent | 9cecbe9bc20c1d888b9cb8a49a55b48a305166ae (diff) | |
| download | mariadb-git-a09659dd577dcf4c9ff907c680df0abf011d047c.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into cane.mysql.fi:/usr/home/tim/my/work
acconfig.h:
Auto merged
configure.in:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mini_client.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mini_client.cc b/sql/mini_client.cc index 11b0b111ec4..12c8a740398 100644 --- a/sql/mini_client.cc +++ b/sql/mini_client.cc @@ -233,7 +233,7 @@ static int mc_sock_connect(my_socket s, const struct sockaddr *name, return connect(s, (struct sockaddr*) name, namelen); #else int flags, res, s_err; - size_socket s_err_size = sizeof(uint); + SOCKOPT_OPTLEN_TYPE s_err_size = sizeof(uint); fd_set sfds; struct timeval tv; |