[Midnightbsd-cvs] mports: databases/mysql50-server: Update MySQL to 5.0.51a.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Mar 11 22:21:09 EDT 2008 

Log Message:
-----------
Update MySQL to 5.0.51a.  (what is this star trek?)

Modified Files:
--------------
    mports/databases/mysql50-server:
        Makefile (r1.7 -> r1.8)
        distinfo (r1.5 -> r1.6)
        pkg-plist (r1.3 -> r1.4)
    mports/databases/mysql50-server/files:
        patch-configure (r1.2 -> r1.3)
        patch-man::Makefile.in (r1.2 -> r1.3)

Added Files:
-----------
    mports/databases/mysql50-server/files:
        patch-client_mysql_upgrade.c (r1.1)
        patch-scripts_mysqld_safe.sh (r1.1)
        patch-sql_sql_select.cc (r1.1)
        patch-vio_viossl.c (r1.1)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/databases/mysql50-server/pkg-plist,v
retrieving revision 1.3
retrieving revision 1.4
diff -L databases/mysql50-server/pkg-plist -L databases/mysql50-server/pkg-plist -u -r1.3 -r1.4
--- databases/mysql50-server/pkg-plist
+++ databases/mysql50-server/pkg-plist
@@ -123,6 +123,7 @@
 %%DATADIR%%/mysql_system_tables.sql
 %%DATADIR%%/mysql_system_tables_data.sql
 %%DATADIR%%/mysql-log-rotate
+%%DATADIR%%/mysqld_multi.server
 %%DATADIR%%/mysql.server
 %%DATADIR%%/ndb-config-2-node.ini
 %%NDB%%%%DATADIR%%/ndb_size.tmpl
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/databases/mysql50-server/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -L databases/mysql50-server/Makefile -L databases/mysql50-server/Makefile -u -r1.7 -r1.8
--- databases/mysql50-server/Makefile
+++ databases/mysql50-server/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.0.45
+PORTVERSION=	5.0.51a
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/databases/mysql50-server/distinfo,v
retrieving revision 1.5
retrieving revision 1.6
diff -L databases/mysql50-server/distinfo -L databases/mysql50-server/distinfo -u -r1.5 -r1.6
--- databases/mysql50-server/distinfo
+++ databases/mysql50-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.0.45.tar.gz) = a2a1c5a82bb22b45ab76a8ecab94e10d
-SHA256 (mysql-5.0.45.tar.gz) = e4443d8dc859ed53bd9f3bef143ce30c7f5dee66a02748e9a003136be25e0060
-SIZE (mysql-5.0.45.tar.gz) = 24433261
+MD5 (mysql-5.0.51a.tar.gz) = a83dbdbb91267daf73d2297a9c283dd1
+SHA256 (mysql-5.0.51a.tar.gz) = 59b06f6a948430c7254760e0bf16f1447ee14d0142073f58fd2e68c327330b68
+SIZE (mysql-5.0.51a.tar.gz) = 27588558
--- /dev/null
+++ databases/mysql50-server/files/patch-scripts_mysqld_safe.sh
@@ -0,0 +1,24 @@
+--- scripts/mysqld_safe.sh.orig	2007-12-12 10:04:16.000000000 +0100
++++ scripts/mysqld_safe.sh	2007-12-12 10:04:52.000000000 +0100
+@@ -152,10 +152,10 @@
+ 
+ if test -z "$MYSQL_HOME"
+ then 
+-  if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
++  if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf"
+   then
+     echo "WARNING: Found two instances of my.cnf -"
+-    echo "$MY_BASEDIR_VERSION/my.cnf and"
++    echo "$MY_BASEDIR_VERSION/etc/my.cnf and"
+     echo "$DATADIR/my.cnf"
+     echo "IGNORING $DATADIR/my.cnf"
+     echo
+@@ -163,7 +163,7 @@
+   elif test -r "$DATADIR/my.cnf"
+   then
+     echo "WARNING: Found $DATADIR/my.cnf"
+-    echo "Datadir is deprecated place for my.cnf, please move it to $MY_BASEDIR_VERSION"
++    echo "Datadir is deprecated place for my.cnf, please move it to $MY_BASEDIR_VERSION/etc"
+     echo
+     MYSQL_HOME=$DATADIR
+   else
Index: patch-man::Makefile.in
===================================================================
RCS file: /home/cvs/mports/databases/mysql50-server/files/patch-man::Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -L databases/mysql50-server/files/patch-man::Makefile.in -L databases/mysql50-server/files/patch-man::Makefile.in -u -r1.2 -r1.3
--- databases/mysql50-server/files/patch-man::Makefile.in
+++ databases/mysql50-server/files/patch-man::Makefile.in
@@ -1,11 +1,13 @@
---- man/Makefile.in.orig	Fri Oct 20 20:23:52 2006
-+++ man/Makefile.in	Thu Nov 23 21:35:20 2006
-@@ -296,7 +296,7 @@
- linked_libmysqld_targets = @linked_libmysqld_targets@
- linked_netware_sources = @linked_netware_sources@
- localstatedir = @localstatedir@
--man1_files = @man1_files@
-+man1_files = 
- man8_files = @man8_files@
- man_dirs = @man_dirs@
- mandir = @mandir@
+--- man/Makefile.in.orig	Wed Oct  4 13:25:43 2006
++++ man/Makefile.in	Sun Oct 22 10:07:26 2006
+@@ -344,8 +344,8 @@
+ yassl_libs = @yassl_libs@
+ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
+ zlib_dir = @zlib_dir@
+-man1_MANS = @man1_files@
+-man8_MANS = @man8_files@
++man1_MANS =
++man8_MANS =
+ EXTRA_DIST = $(man1_MANS) $(man8_MANS)
+ all: all-am
+ 
Index: patch-configure
===================================================================
RCS file: /home/cvs/mports/databases/mysql50-server/files/patch-configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -L databases/mysql50-server/files/patch-configure -L databases/mysql50-server/files/patch-configure -u -r1.2 -r1.3
--- databases/mysql50-server/files/patch-configure
+++ databases/mysql50-server/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Fri Oct 20 20:24:24 2006
-+++ configure	Thu Nov 23 21:31:14 2006
+--- configure.orig	Thu Jul 27 20:53:44 2006
++++ configure	Thu Aug 10 10:16:48 2006
 @@ -20093,8 +20093,6 @@
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -20,16 +20,3 @@
  
  ndb_cxxflags_fix=
  case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_c_compiler_gnu in
-@@ -39023,9 +39021,9 @@
- /usr/lib /usr/lib64 /opt/ssl/lib /opt/openssl/lib \
- /usr/freeware/lib32 /usr/local/lib/ ; do
-       # Test for libssl using all known library file endings
--      if test -f $d/libssl.a || test -f $d/libssl.so || \
--         test -f $d/libssl.sl || test -f $d/libssl.dylib ; then
--        OPENSSL_LIB=$d
-+      if test -f $libs/libssl.a || test -f $libs/libssl.so || \
-+         test -f $libs/libssl.sl || test -f $libs/libssl.dylib ; then
-+        OPENSSL_LIB=$libs
-       fi
-       done
-       ;;
--- /dev/null
+++ databases/mysql50-server/files/patch-vio_viossl.c
@@ -0,0 +1,57 @@
+--- vio/viossl.c.orig	2007-11-15 15:07:13.000000000 +0100
++++ vio/viossl.c	2008-01-21 08:02:45.000000000 +0100
+@@ -172,20 +172,14 @@
+   vio_delete(vio);
+ }
+ 
+-int sslaccept(struct st_VioSSLFd *ptr, Vio *vio, long timeout)
+-{
+-  DBUG_ENTER("sslaccept");
+-  DBUG_RETURN(sslconnect(ptr, vio, timeout));
+-}
+-
+-
+-int sslconnect(struct st_VioSSLFd *ptr, Vio *vio, long timeout)
++static
++int sslprocess(struct st_VioSSLFd *ptr, Vio *vio, long timeout, my_bool accept)
+ {
+   SSL *ssl;
+   my_bool unused;
+   my_bool was_blocking;
+ 
+-  DBUG_ENTER("sslconnect");
++  DBUG_ENTER("sslprocess");
+   DBUG_PRINT("enter", ("ptr: 0x%lx, sd: %d  ctx: 0x%lx",
+                        (long) ptr, vio->sd, (long) ptr->ssl_context));
+ 
+@@ -201,6 +195,12 @@
+   }
+   DBUG_PRINT("info", ("ssl: 0x%lx timeout: %ld", (long) ssl, timeout));
+   SSL_clear(ssl);
++
++  if (accept)
++	  SSL_set_accept_state(ssl);
++  else
++	  SSL_set_connect_state(ssl);
++
+   SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout);
+   SSL_set_fd(ssl, vio->sd);
+ 
+@@ -258,6 +258,17 @@
+   DBUG_RETURN(0);
+ }
+ 
++int sslaccept(struct st_VioSSLFd *ptr, Vio *vio, long timeout)
++{
++  DBUG_ENTER("sslaccept");
++  DBUG_RETURN(sslprocess(ptr, vio, timeout, TRUE));
++}
++
++int sslconnect(struct st_VioSSLFd *ptr, Vio *vio, long timeout)
++{
++  DBUG_ENTER("sslconnect");
++  DBUG_RETURN(sslprocess(ptr, vio, timeout, FALSE));
++}
+ 
+ int vio_ssl_blocking(Vio *vio __attribute__((unused)),
+ 		     my_bool set_blocking_mode,
--- /dev/null
+++ databases/mysql50-server/files/patch-sql_sql_select.cc
@@ -0,0 +1,12 @@
+--- sql/sql_select.cc.orig	2008-01-31 23:10:38.000000000 +0100
++++ sql/sql_select.cc	2008-01-31 23:11:31.000000000 +0100
+@@ -1068,7 +1068,8 @@
+         <fields> to ORDER BY <fields>. One exception is if skip_sort_order is
+         set (see above), then we can simply skip GROUP BY.
+        */
+-      order= skip_sort_order ? 0 : group_list;
++      if (!order || test_if_subpart(group_list, order))
++          order= skip_sort_order ? 0 : group_list;
+       group_list= 0;
+       group= 0;
+     }
--- /dev/null
+++ databases/mysql50-server/files/patch-client_mysql_upgrade.c
@@ -0,0 +1,13 @@
+--- client/mysql_upgrade.c.orig	2007-11-15 15:06:52.000000000 +0100
++++ client/mysql_upgrade.c	2007-12-12 10:07:23.000000000 +0100
+@@ -411,10 +411,6 @@
+ 
+   verbose("Looking for '%s' in: %s", tool_name, tool_path);
+ 
+-  /* Make sure the tool exists */
+-  if (my_access(tool_path, F_OK) != 0)
+-    die("Can't find '%s'", tool_path);
+-
+   /*
+     Make sure it can be executed
+   */

More information about the Midnightbsd-cvs mailing list