6 files changed, 24 insertions, 93 deletions

diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index c09569c79f92..5ad8a12c2db5 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.0.51a
+PORTVERSION=	5.0.67
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
diff --git a/databases/mysql50-server/distinfo b/databases/mysql50-server/distinfo
index 361c8681ca27..0d84b3caabcb 100644
--- a/databases/mysql50-server/distinfo
+++ b/databases/mysql50-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.0.51a.tar.gz) = a83dbdbb91267daf73d2297a9c283dd1
-SHA256 (mysql-5.0.51a.tar.gz) = 59b06f6a948430c7254760e0bf16f1447ee14d0142073f58fd2e68c327330b68
-SIZE (mysql-5.0.51a.tar.gz) = 27588558
+MD5 (mysql-5.0.67.tar.gz) = 7164483a5ffb8f7aa59b761c13cdbd6e
+SHA256 (mysql-5.0.67.tar.gz) = 7b64e609849ff64f2fcb82a2b72883f79adc893e9f6fc0d35465ef7d97542058
+SIZE (mysql-5.0.67.tar.gz) = 28370810
diff --git a/databases/mysql50-server/files/patch-Docs::Makefile.in b/databases/mysql50-server/files/patch-Docs::Makefile.in
index fdb104a450c0..03eb804855c0 100644
--- a/databases/mysql50-server/files/patch-Docs::Makefile.in
+++ b/databases/mysql50-server/files/patch-Docs::Makefile.in
@@ -1,15 +1,15 @@
---- Docs/Makefile.in.orig	Thu Dec 15 00:34:47 2005
-+++ Docs/Makefile.in	Thu Dec 22 15:34:13 2005
-@@ -346,7 +346,7 @@
- # generated files explicitly in DISTCLEANFILES.
- DISTCLEANFILES = $(TXT_FILES)
- GT = $(srcdir)/Support/generate-text-files.pl
+--- Docs/Makefile.in.orig	2008-08-04 14:22:00.000000000 +0200
++++ Docs/Makefile.in	2008-08-27 12:15:55.000000000 +0200
+@@ -348,7 +348,7 @@
+ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
+ zlib_dir = @zlib_dir@
+ EXTRA_DIST = mysql.info INSTALL-BINARY @extra_docs@
 -all: all-am
 +all:
  
  .SUFFIXES:
  $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-@@ -432,7 +432,7 @@
+@@ -433,7 +433,7 @@
  install-data: install-data-am
  uninstall: uninstall-am
  
diff --git a/databases/mysql50-server/files/patch-mysys_default.c b/databases/mysql50-server/files/patch-mysys_default.c
index 7c1dbe23aa9a..16c246c81cda 100644
--- a/databases/mysql50-server/files/patch-mysys_default.c
+++ b/databases/mysql50-server/files/patch-mysys_default.c
@@ -1,6 +1,6 @@
---- mysys/default.c.orig	Thu May 26 15:26:56 2005
-+++ mysys/default.c	Fri Jun  3 17:16:59 2005
-@@ -517,7 +517,7 @@
+--- mysys/default.c.orig	2008-08-04 14:19:45.000000000 +0200
++++ mysys/default.c	2008-08-27 12:23:54.000000000 +0200
+@@ -634,7 +634,7 @@
    {
      MY_STAT stat_info;
      if (!my_stat(name,&stat_info,MYF(0)))
@@ -9,14 +9,14 @@
      /*
        Ignore world-writable regular files.
        This is mainly done to protect us to not read a file created by
-@@ -867,9 +867,8 @@
-     *ptr++= env;
+@@ -1084,7 +1084,10 @@
+     errors += add_directory(alloc, env, dirs);
+ #elif defined(DEFAULT_SYSCONFDIR)
+   if (DEFAULT_SYSCONFDIR != "")
++  {
+     errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
++    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "mysql", dirs);
++  }
+ #endif /* __EMX__ || __OS2__ */
+ 
  #endif
-   *ptr++= "/etc/";
-+  *ptr++= "%%PREFIX%%/etc/";
- #endif
--  if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
--    *ptr++= env;
-   *ptr++= "";			/* Place for defaults_extra_file */
- #if !defined(__WIN__) && !defined(__NETWARE__)
-   *ptr++= "~/";;
diff --git a/databases/mysql50-server/files/patch-sql_sql_select.cc b/databases/mysql50-server/files/patch-sql_sql_select.cc
deleted file mode 100644
index 46b099565017..000000000000
--- a/databases/mysql50-server/files/patch-sql_sql_select.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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;
-     }
diff --git a/databases/mysql50-server/files/patch-vio_viossl.c b/databases/mysql50-server/files/patch-vio_viossl.c
deleted file mode 100644
index 7614326aeaae..000000000000
--- a/databases/mysql50-server/files/patch-vio_viossl.c
+++ /dev/null
@@ -1,57 +0,0 @@
---- 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,