Ticket #4933: mysql.diff

File mysql.diff, 1.4 KB (added by pguyot (Paul Guyot), 19 years ago)

Patch to fix the problem

  • Portfile 

    RCS file: /Volumes/src/cvs/od/proj/darwinports/dports/databases/mysql/Portfile,v
retrieving revision 1.41
diff -u -r1.41 Portfile
     
    1818
    1919checksums               md5 835a96c86132fbde0db36db60c5b34cd
    2020
    21 patchfiles              patch-libmysql-violite.c patch-sql-violite.c
     21patchfiles              patch-libmysql-violite.c patch-sql-violite.c patch-sql-mysqld.cc
    2222
    2323set dbdir               ${prefix}/var/db/mysql
    2424

  • new file files/patch-sql-mysqld.cc

    - +  
     1--- sql/mysqld.cc       2005-09-11 19:08:07.000000000 +0200
     2+++ sql/mysqld.cc       2005-09-11 19:08:03.000000000 +0200
     3@@ -2490,7 +2490,7 @@
     4     {
     5       size_socket length=sizeof(struct sockaddr_in);
     6       new_sock = accept(sock, my_reinterpret_cast(struct sockaddr *) (&cAddr),
     7-                       &length);
     8+                       (socklen_t*) &length);
     9       if (new_sock != INVALID_SOCKET ||
     10          (socket_errno != SOCKET_EINTR && socket_errno != SOCKET_EAGAIN))
     11        break;
     12@@ -2556,7 +2556,7 @@
     13       size_socket dummyLen;
     14       struct sockaddr dummy;
     15       dummyLen = sizeof(struct sockaddr);
     16-      if (getsockname(new_sock,&dummy, &dummyLen) < 0)
     17+      if (getsockname(new_sock,&dummy, (socklen_t*) &dummyLen) < 0)
     18       {
     19        sql_perror("Error on new connection socket");
     20        (void) shutdown(new_sock,2);