remove my_global.h macros for sockets --- include/my_global.h | 13 ----------- ndb/src/common/mgmcommon/ConfigRetriever.cpp | 9 +++++--- ndb/src/common/transporter/TransporterRegistry.cpp | 2 - ndb/src/common/util/SocketClient.cpp | 8 +++---- ndb/src/common/util/SocketServer.cpp | 10 ++++----- ndb/src/common/util/socket_io.cpp | 11 ++++++---- sql-common/client.c | 14 ++++++------ sql/mysqld.cc | 23 +++++++++++---------- vio/viosocket.c | 13 ++++++----- vio/viossl.c | 2 - 10 files changed, 51 insertions(+), 54 deletions(-) Index: mysql-5.0-ndbwin32/include/my_global.h =================================================================== --- mysql-5.0-ndbwin32.orig/include/my_global.h 2008-03-28 15:05:48.178765847 +1100 +++ mysql-5.0-ndbwin32/include/my_global.h 2008-03-28 15:07:42.021732861 +1100 @@ -547,9 +547,6 @@ C_MODE_END typedef int File; /* File descriptor */ #include -#ifndef Socket_defined -#define INVALID_SOCKET MY_INVALID_SOCKET -#endif /* Type for fuctions that handles signals */ #define sig_handler RETSIGTYPE C_MODE_START @@ -700,11 +697,6 @@ typedef SOCKET_SIZE_TYPE size_socket; #undef remove /* Crashes MySQL on SCO 5.0.0 */ #ifndef __WIN__ -#ifdef OS2 -#define closesocket(A) soclose(A) -#else -#define closesocket(A) my_socket_close(A) -#endif #ifndef ulonglong2double #define ulonglong2double(A) ((double) (ulonglong) (A)) #define my_off_t2double(A) ((double) (my_off_t) (A)) @@ -941,7 +933,6 @@ typedef off_t os_off_t; #endif #if defined(__WIN__) -#define socket_errno my_socket_errno() #define SOCKET_EINTR WSAEINTR #define SOCKET_EAGAIN WSAEINPROGRESS #define SOCKET_ETIMEDOUT WSAETIMEDOUT @@ -951,7 +942,6 @@ typedef off_t os_off_t; #define SOCKET_ENFILE ENFILE #define SOCKET_EMFILE EMFILE #elif defined(OS2) -#define socket_errno sock_errno() #define SOCKET_EINTR SOCEINTR #define SOCKET_EAGAIN SOCEINPROGRESS #define SOCKET_ETIMEDOUT SOCKET_EINTR @@ -960,10 +950,7 @@ typedef off_t os_off_t; #define SOCKET_ECONNREFUSED SOCECONNREFUSED #define SOCKET_ENFILE SOCENFILE #define SOCKET_EMFILE SOCEMFILE -#define closesocket(A) soclose(A) #else /* Unix */ -#define socket_errno my_socket_errno() -#define closesocket(A) my_socket_close(A) #define SOCKET_EINTR EINTR #define SOCKET_EAGAIN EAGAIN #define SOCKET_ETIMEDOUT SOCKET_EINTR Index: mysql-5.0-ndbwin32/ndb/src/common/util/socket_io.cpp =================================================================== --- mysql-5.0-ndbwin32.orig/ndb/src/common/util/socket_io.cpp 2008-03-28 15:10:57.398824844 +1100 +++ mysql-5.0-ndbwin32/ndb/src/common/util/socket_io.cpp 2008-03-28 15:11:52.236254035 +1100 @@ -78,8 +78,9 @@ readln_socket(NDB_SOCKET_TYPE socket, in do { int t; - while((t = my_recv(socket, ptr, len, MSG_PEEK)) == -1 && socket_errno == EINTR); - + while((t = my_recv(socket, ptr, len, MSG_PEEK)) == -1 + && my_socket_errno() == EINTR); + if(t < 1) { return -1; @@ -95,7 +96,8 @@ readln_socket(NDB_SOCKET_TYPE socket, in */ for (len = 1 + i; len; ) { - while ((t = my_recv(socket, ptr, len, 0)) == -1 && socket_errno == EINTR); + while ((t = my_recv(socket, ptr, len, 0)) == -1 + && my_socket_errno() == EINTR); if (t < 1) return -1; ptr += t; @@ -114,7 +116,8 @@ readln_socket(NDB_SOCKET_TYPE socket, in for (int tmp = t; tmp; ) { - while ((t = my_recv(socket, ptr, tmp, 0)) == -1 && socket_errno == EINTR); + while ((t = my_recv(socket, ptr, tmp, 0)) == -1 + && my_socket_errno() == EINTR); if (t < 1) { return -1; Index: mysql-5.0-ndbwin32/ndb/src/common/mgmcommon/ConfigRetriever.cpp =================================================================== --- mysql-5.0-ndbwin32.orig/ndb/src/common/mgmcommon/ConfigRetriever.cpp 2008-03-28 15:15:49.838446503 +1100 +++ mysql-5.0-ndbwin32/ndb/src/common/mgmcommon/ConfigRetriever.cpp 2008-03-28 15:16:27.083417194 +1100 @@ -269,9 +269,12 @@ ConfigRetriever::verifyConfig(const stru if (hostname && hostname[0] != 0 && !SocketServer::tryBind(0,hostname)) { - BaseString::snprintf(buf, 255, "Config hostname(%s) don't match a local interface," - " tried to bind, error = %d - %s", - hostname, socket_errno, strerror(socket_errno)); + BaseString::snprintf(buf, 255, + "Config hostname(%s) don't match a local interface," + " tried to bind, error = %d - %s", + hostname, + my_socket_errno(), + strerror(my_socket_errno())); setError(CR_ERROR, buf); return false; } Index: mysql-5.0-ndbwin32/ndb/src/common/transporter/TransporterRegistry.cpp =================================================================== --- mysql-5.0-ndbwin32.orig/ndb/src/common/transporter/TransporterRegistry.cpp 2008-03-28 15:15:06.181308696 +1100 +++ mysql-5.0-ndbwin32/ndb/src/common/transporter/TransporterRegistry.cpp 2008-03-28 15:15:19.433654083 +1100 @@ -891,7 +891,7 @@ TransporterRegistry::poll_TCP(Uint32 tim #endif tcpReadSelectReply = select(maxSocketValue+1, &tcpReadset, 0, 0, &timeout); - if(false && tcpReadSelectReply == -1 && socket_errno == SOCKET_EINTR) + if(false && tcpReadSelectReply == -1 && my_socket_errno() == SOCKET_EINTR) ndbout_c("woke-up by signal"); #ifdef NDB_WIN32 Index: mysql-5.0-ndbwin32/ndb/src/common/util/SocketClient.cpp =================================================================== --- mysql-5.0-ndbwin32.orig/ndb/src/common/util/SocketClient.cpp 2008-03-28 15:13:27.498736798 +1100 +++ mysql-5.0-ndbwin32/ndb/src/common/util/SocketClient.cpp 2008-03-28 15:14:29.700357917 +1100 @@ -79,7 +79,7 @@ SocketClient::bind(const char* bindaddre // Convert ip address presentation format to numeric format if (Ndb_getInAddr(&local.sin_addr, bindaddress)) { - return socket_errno ? socket_errno : EINVAL; + return my_socket_errno() ? my_socket_errno() : EINVAL; } if (my_socket_reuseaddr(m_sockfd, true) == -1) @@ -151,7 +151,7 @@ SocketClient::connect(const char *toaddr if (r == 0) goto done; // connected immediately. - err= socket_errno; + err= my_socket_errno(); if (r < 0 && NONBLOCKERR(err)) { my_socket_close(m_sockfd); @@ -182,7 +182,7 @@ SocketClient::connect(const char *toaddr if (my_getsockopt(m_sockfd, SOL_SOCKET, SO_ERROR, &r, &len) < 0 || r) { // Solaris got an error... different than others - err= socket_errno; + err= my_socket_errno(); my_socket_close(m_sockfd); my_socket_invalidate(&m_sockfd); return m_sockfd; @@ -190,7 +190,7 @@ SocketClient::connect(const char *toaddr } else { - err= socket_errno; + err= my_socket_errno(); // select error, probably m_sockfd not set. my_socket_close(m_sockfd); my_socket_invalidate(&m_sockfd); Index: mysql-5.0-ndbwin32/ndb/src/common/util/SocketServer.cpp =================================================================== --- mysql-5.0-ndbwin32.orig/ndb/src/common/util/SocketServer.cpp 2008-03-28 15:12:17.112902378 +1100 +++ mysql-5.0-ndbwin32/ndb/src/common/util/SocketServer.cpp 2008-03-28 15:13:09.730273710 +1100 @@ -103,7 +103,7 @@ SocketServer::setup(SocketServer::Servic if (!my_socket_valid(sock)) { DBUG_PRINT("error",("socket() - %d - %s", - socket_errno, strerror(socket_errno))); + my_socket_errno(), strerror(my_socket_errno()))); DBUG_RETURN(false); } @@ -113,14 +113,14 @@ SocketServer::setup(SocketServer::Servic if (my_socket_reuseaddr(sock, true) == -1) { DBUG_PRINT("error",("setsockopt() - %d - %s", - socket_errno, strerror(socket_errno))); + my_socket_errno(), strerror(my_socket_errno()))); NDB_CLOSE_SOCKET(sock); DBUG_RETURN(false); } if (my_bind_inet(sock, &servaddr) == -1) { DBUG_PRINT("error",("bind() - %d - %s", - socket_errno, strerror(socket_errno))); + my_socket_errno(), strerror(my_socket_errno()))); NDB_CLOSE_SOCKET(sock); DBUG_RETURN(false); } @@ -129,7 +129,7 @@ SocketServer::setup(SocketServer::Servic if(my_socket_get_port(sock, port)) { ndbout_c("An error occurred while trying to find out what" - " port we bound to. Error: %s",strerror(socket_errno)); + " port we bound to. Error: %s",strerror(my_socket_errno())); NDB_CLOSE_SOCKET(sock); DBUG_RETURN(false); } @@ -138,7 +138,7 @@ SocketServer::setup(SocketServer::Servic if (my_listen(sock, m_maxSessions > 32 ? 32 : m_maxSessions) == -1){ DBUG_PRINT("error",("listen() - %d - %s", - socket_errno, strerror(socket_errno))); + my_socket_errno(), strerror(my_socket_errno()))); NDB_CLOSE_SOCKET(sock); DBUG_RETURN(false); } Index: mysql-5.0-ndbwin32/sql-common/client.c =================================================================== --- mysql-5.0-ndbwin32.orig/sql-common/client.c 2008-03-28 15:26:47.235579806 +1100 +++ mysql-5.0-ndbwin32/sql-common/client.c 2008-03-28 15:27:18.172386092 +1100 @@ -700,7 +700,7 @@ cli_advanced_command(MYSQL *mysql, enum arg, arg_length)) { DBUG_PRINT("error",("Can't send command to server. Error: %d", - socket_errno)); + my_socket_errno())); if (net->last_errno == ER_NET_PACKET_TOO_LARGE) { net->last_errno=CR_NET_PACKET_TOO_LARGE; @@ -1919,7 +1919,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,cons net->last_errno=CR_SOCKET_CREATE_ERROR; strmov(net->sqlstate, unknown_sqlstate); my_snprintf(net->last_error,sizeof(net->last_error)-1, - ER(net->last_errno),socket_errno); + ER(net->last_errno), my_socket_errno()); goto error; } net->vio= vio_new(sock, VIO_TYPE_SOCKET, @@ -1931,11 +1931,11 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,cons mysql->options.connect_timeout)) { DBUG_PRINT("error",("Got error %d on connect to local server", - socket_errno)); + my_socket_errno())); net->last_errno=CR_CONNECTION_ERROR; strmov(net->sqlstate, unknown_sqlstate); my_snprintf(net->last_error,sizeof(net->last_error)-1, - ER(net->last_errno),unix_socket,socket_errno); + ER(net->last_errno), unix_socket, my_socket_errno()); goto error; } mysql->options.protocol=MYSQL_PROTOCOL_SOCKET; @@ -1995,7 +1995,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,cons net->last_errno=CR_IPSOCK_ERROR; strmov(net->sqlstate, unknown_sqlstate); my_snprintf(net->last_error,sizeof(net->last_error)-1, - ER(net->last_errno),socket_errno); + ER(net->last_errno), my_socket_errno()); goto error; } net->vio= vio_new(sock, VIO_TYPE_TCPIP, VIO_BUFFERED_READ); @@ -2034,12 +2034,12 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,cons if (my_connect(sock,(struct sockaddr *) &sock_addr, sizeof(sock_addr), mysql->options.connect_timeout)) { - DBUG_PRINT("error",("Got error %d on connect to '%s'",socket_errno, + DBUG_PRINT("error",("Got error %d on connect to '%s'",my_socket_errno(), host)); net->last_errno= CR_CONN_HOST_ERROR; strmov(net->sqlstate, unknown_sqlstate); my_snprintf(net->last_error, sizeof(net->last_error)-1, - ER(CR_CONN_HOST_ERROR), host, socket_errno); + ER(CR_CONN_HOST_ERROR), host, my_socket_errno()); goto error; } } Index: mysql-5.0-ndbwin32/sql/mysqld.cc =================================================================== --- mysql-5.0-ndbwin32.orig/sql/mysqld.cc 2008-03-28 15:24:19.367726025 +1100 +++ mysql-5.0-ndbwin32/sql/mysqld.cc 2008-03-28 15:25:22.521371956 +1100 @@ -1498,7 +1498,7 @@ static void network_init(void) ip_sock = my_socket_create(AF_INET, SOCK_STREAM, 0); if (!my_socket_valid(ip_sock)) { - DBUG_PRINT("error",("Got error: %d from socket()",socket_errno)); + DBUG_PRINT("error",("Got error: %d from socket()",my_socket_errno())); sql_perror(ER(ER_IPSOCK_ERROR)); /* purecov: tested */ unireg_abort(1); /* purecov: tested */ } @@ -1525,7 +1525,7 @@ static void network_init(void) for (waited= 0, retry= 1; ; retry++, waited+= this_wait) { if (((ret= my_bind_inet(ip_sock, &IPaddr)) >= 0) || - (socket_errno != SOCKET_EADDRINUSE) || + (my_socket_errno() != SOCKET_EADDRINUSE) || (waited >= mysqld_port_timeout)) break; sql_print_information("Retrying bind on TCP/IP port %u", mysqld_port); @@ -1534,7 +1534,7 @@ static void network_init(void) } if (ret < 0) { - DBUG_PRINT("error",("Got error: %d from bind",socket_errno)); + DBUG_PRINT("error",("Got error: %d from bind", my_socket_errno())); sql_perror("Can't start server: Bind on TCP/IP port"); sql_print_error("Do you already have another mysqld server running on port: %d ?",mysqld_port); unireg_abort(1); @@ -1543,7 +1543,7 @@ static void network_init(void) { sql_perror("Can't start server: listen() on TCP/IP port"); sql_print_error("listen() on TCP/IP failed with error %d", - socket_errno); + my_socket_errno()); unireg_abort(1); } } @@ -1637,7 +1637,7 @@ static void network_init(void) #endif if (my_listen(unix_sock,(int) back_log) < 0) sql_print_warning("listen() on Unix socket failed with error %d", - socket_errno); + my_socket_errno()); } #endif DBUG_PRINT("info",("server started")); @@ -4179,10 +4179,11 @@ pthread_handler_t handle_connections_soc #else if (select((int) max_used_connection+1,&readFDs,0,0,0) < 0) { - if (socket_errno != SOCKET_EINTR) + if (my_socket_errno() != SOCKET_EINTR) { if (!select_errors++ && !abort_loop) /* purecov: inspected */ - sql_print_error("mysqld: Got error %d from select",socket_errno); /* purecov: inspected */ + sql_print_error("mysqld: Got error %d from select", + my_socket_errno()); /* purecov: inspected */ } MAYBE_BROKEN_SYSCALL continue; @@ -4219,13 +4220,14 @@ pthread_handler_t handle_connections_soc &length); #ifdef __NETWARE__ // TODO: temporary fix, waiting for TCP/IP fix - DEFECT000303149 - if ((!my_socket_valid(new_sock)) && (socket_errno == EINVAL)) + if ((!my_socket_valid(new_sock)) && (my_socket_errno() == EINVAL)) { kill_server(SIGTERM); } #endif if (my_socket_valid(new_sock) || - (socket_errno != SOCKET_EINTR && socket_errno != SOCKET_EAGAIN)) + (my_socket_errno() != SOCKET_EINTR + && my_socket_errno() != SOCKET_EAGAIN)) break; MAYBE_BROKEN_SYSCALL; #if !defined(NO_FCNTL_NONBLOCK) @@ -4245,7 +4247,8 @@ pthread_handler_t handle_connections_soc if ((error_count++ & 255) == 0) // This can happen often sql_perror("Error in accept"); MAYBE_BROKEN_SYSCALL; - if (socket_errno == SOCKET_ENFILE || socket_errno == SOCKET_EMFILE) + if (my_socket_errno() == SOCKET_ENFILE + || my_socket_errno() == SOCKET_EMFILE) sleep(1); // Give other threads some time continue; } Index: mysql-5.0-ndbwin32/vio/viosocket.c =================================================================== --- mysql-5.0-ndbwin32.orig/vio/viosocket.c 2008-03-28 15:20:34.149856322 +1100 +++ mysql-5.0-ndbwin32/vio/viosocket.c 2008-03-28 15:21:07.074714420 +1100 @@ -107,7 +107,7 @@ int vio_write(Vio * vio, const gptr buf, #ifndef DBUG_OFF if (r < 0) { - DBUG_PRINT("vio_error", ("Got error on write: %d",socket_errno)); + DBUG_PRINT("vio_error", ("Got error on write: %d",my_socket_errno())); } #endif /* DBUG_OFF */ DBUG_PRINT("exit", ("%d", r)); @@ -239,7 +239,7 @@ int vio_keepalive(Vio* vio, my_bool set_ my_bool vio_should_retry(Vio * vio __attribute__((unused))) { - int en = socket_errno; + int en = my_socket_errno(); return (en == SOCKET_EAGAIN || en == SOCKET_EINTR || en == SOCKET_EWOULDBLOCK); } @@ -248,7 +248,7 @@ vio_should_retry(Vio * vio __attribute__ my_bool vio_was_interrupted(Vio *vio __attribute__((unused))) { - int en= socket_errno; + int en= my_socket_errno(); return (en == SOCKET_EAGAIN || en == SOCKET_EINTR || en == SOCKET_EWOULDBLOCK || en == SOCKET_ETIMEDOUT); } @@ -279,7 +279,7 @@ int vio_close(Vio * vio) } if (r) { - DBUG_PRINT("vio_error", ("close() failed, error: %d",socket_errno)); + DBUG_PRINT("vio_error", ("close() failed, error: %d", my_socket_errno())); /* FIXME: error handling (not critical for MySQL) */ } vio->type= VIO_CLOSED; @@ -320,7 +320,7 @@ my_bool vio_peer_addr(Vio * vio, char *b if (my_getpeername(vio->sd, (struct sockaddr *) (&vio->remote), &addrLen) != 0) { - DBUG_PRINT("exit", ("getpeername gave error: %d", socket_errno)); + DBUG_PRINT("exit", ("getpeername gave error: %d", my_socket_errno())); DBUG_RETURN(1); } my_inet_ntoa(vio->remote.sin_addr,buf); @@ -400,7 +400,8 @@ void vio_timeout(Vio *vio, uint which, u #ifndef DBUG_OFF if (r != 0) - DBUG_PRINT("error", ("setsockopt failed: %d, errno: %d", r, socket_errno)); + DBUG_PRINT("error", ("setsockopt failed: %d, errno: %d", r, + my_socket_errno())); #endif DBUG_VOID_RETURN; Index: mysql-5.0-ndbwin32/vio/viossl.c =================================================================== --- mysql-5.0-ndbwin32.orig/vio/viossl.c 2008-03-28 15:22:52.489461775 +1100 +++ mysql-5.0-ndbwin32/vio/viossl.c 2008-03-28 15:23:01.321691963 +1100 @@ -77,7 +77,7 @@ report_errors(SSL* ssl) DBUG_PRINT("error", ("error: %s", ERR_error_string(SSL_get_error(ssl, l), buf))); - DBUG_PRINT("info", ("socket_errno: %d", socket_errno)); + DBUG_PRINT("info", ("socket_errno: %d", my_socket_errno())); DBUG_VOID_RETURN; }