|
@@ -0,0 +1,33 @@
|
|
|
|
|
+diff -Naur mysql-3.23.52.orig/sql/mini_client.cc mysql-3.23.52/sql/mini_client.cc
|
|
|
|
|
+--- mysql-3.23.52.orig/sql/mini_client.cc Mon Aug 19 15:47:00 2002
|
|
|
|
|
++++ mysql-3.23.52/sql/mini_client.cc Mon Aug 19 15:48:44 2002
|
|
|
|
|
+@@ -318,7 +318,7 @@
|
|
|
|
|
+ */
|
|
|
|
|
+
|
|
|
|
|
+ s_err=0;
|
|
|
|
|
+- if (getsockopt(s, SOL_SOCKET, SO_ERROR, (char*) &s_err, &s_err_size) != 0)
|
|
|
|
|
++ if (getsockopt(s, SOL_SOCKET, SO_ERROR, (char*) &s_err, (socklen_t *)&s_err_size) != 0)
|
|
|
|
|
+ return(-1);
|
|
|
|
|
+
|
|
|
|
|
+ if (s_err)
|
|
|
|
|
+diff -Naur mysql-3.23.52.orig/sql/mysqld.cc mysql-3.23.52/sql/mysqld.cc
|
|
|
|
|
+--- mysql-3.23.52.orig/sql/mysqld.cc Mon Aug 19 15:47:01 2002
|
|
|
|
|
++++ mysql-3.23.52/sql/mysqld.cc Mon Aug 19 15:49:01 2002
|
|
|
|
|
+@@ -2407,7 +2407,7 @@
|
|
|
|
|
+ {
|
|
|
|
|
+ size_socket length=sizeof(struct sockaddr_in);
|
|
|
|
|
+ new_sock = accept(sock, my_reinterpret_cast(struct sockaddr *) (&cAddr),
|
|
|
|
|
+- &length);
|
|
|
|
|
++ (socklen_t *)&length);
|
|
|
|
|
+ if (new_sock != INVALID_SOCKET ||
|
|
|
|
|
+ (socket_errno != SOCKET_EINTR && socket_errno != SOCKET_EAGAIN))
|
|
|
|
|
+ break;
|
|
|
|
|
+@@ -2473,7 +2473,7 @@
|
|
|
|
|
+ size_socket dummyLen;
|
|
|
|
|
+ struct sockaddr dummy;
|
|
|
|
|
+ dummyLen = sizeof(struct sockaddr);
|
|
|
|
|
+- if (getsockname(new_sock,&dummy, &dummyLen) < 0)
|
|
|
|
|
++ if (getsockname(new_sock,&dummy, (socklen_t *)&dummyLen) < 0)
|
|
|
|
|
+ {
|
|
|
|
|
+ sql_perror("Error on new connection socket");
|
|
|
|
|
+ (void) shutdown(new_sock,2);
|