Ver código fonte

align mysql.patch with vendor source

Michael van Elst 22 anos atrás
pai
commit
2897d29483
1 arquivos alterados com 11 adições e 11 exclusões
  1. 11 11
      mysql/mysql.patch

+ 11 - 11
mysql/mysql.patch

@@ -1,5 +1,5 @@
---- sql/mini_client.cc	Mon Aug 19 15:47:00 2002
-+++ sql/mini_client.cc	Mon Aug 19 15:48:44 2002
+--- sql/mini_client.cc.dist	Tue Mar 18 12:10:58 2003
++++ sql/mini_client.cc	Tue Mar 18 12:11:17 2003
 @@ -318,7 +318,7 @@
     */
  
@@ -9,9 +9,9 @@
      return(-1);
  
    if (s_err)
---- sql/mysqld.cc	Mon Aug 19 15:47:01 2002
-+++ sql/mysqld.cc	Mon Aug 19 15:49:01 2002
-@@ -2407,7 +2407,7 @@
+--- sql/mysqld.cc.dist	Tue Mar 18 12:10:58 2003
++++ sql/mysqld.cc	Tue Mar 18 12:11:18 2003
+@@ -2476,7 +2476,7 @@
      {
        size_socket length=sizeof(struct sockaddr_in);
        new_sock = accept(sock, my_reinterpret_cast(struct sockaddr *) (&cAddr),
@@ -20,7 +20,7 @@
        if (new_sock != INVALID_SOCKET ||
  	  (socket_errno != SOCKET_EINTR && socket_errno != SOCKET_EAGAIN))
  	break;
-@@ -2473,7 +2473,7 @@
+@@ -2542,7 +2542,7 @@
        size_socket dummyLen;
        struct sockaddr dummy;
        dummyLen = sizeof(struct sockaddr);
@@ -29,8 +29,8 @@
        {
  	sql_perror("Error on new connection socket");
  	(void) shutdown(new_sock,2);
---- scripts/mysql_install_db.sh    Mon Dec  2 17:40:15 2002
-+++ scripts/mysql_install_db.sh Mon Dec  2 17:41:41 2002
+--- scripts/mysql_install_db.sh.dist	Tue Mar 18 12:10:58 2003
++++ scripts/mysql_install_db.sh	Tue Mar 18 12:11:18 2003
 @@ -133,14 +133,13 @@
    fi
  fi
@@ -81,9 +81,9 @@
      echo
    fi
    echo "Please report any problems with the @scriptdir@/mysqlbug script!"
---- mysys/default.c.dist	Fri Jan 10 11:42:15 2003
-+++ mysys/default.c	Fri Jan 10 11:42:31 2003
-@@ -48,7 +48,7 @@
+--- mysys/default.c.dist	Tue Mar 18 12:10:58 2003
++++ mysys/default.c	Tue Mar 18 12:11:18 2003
+@@ -49,7 +49,7 @@
  #ifdef __WIN__
  "C:/",
  #else