4 files changed, 16 insertions, 26 deletions

diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 13cad4a0a693..d1a9f7e0c667 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.26
+PORTVERSION=	5.1.28
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo
index 3eb87b2c9e38..30b19f5f3cfa 100644
--- a/databases/mysql54-server/distinfo
+++ b/databases/mysql54-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.26-rc.tar.gz) = db4b30ef40493e0bfe9ca17dd8220cf5
-SHA256 (mysql-5.1.26-rc.tar.gz) = 3a782d85b1aa5b2a47e67e80021e022c06c9d429f8afbc6cde1333d0bcb97dc6
-SIZE (mysql-5.1.26-rc.tar.gz) = 28111441
+MD5 (mysql-5.1.28-rc.tar.gz) = ff3936126e4ec0cc0d9cb00498ba57e7
+SHA256 (mysql-5.1.28-rc.tar.gz) = 71c67e4c8218e0f2d1ef739c4ffd1c23437f80ad2d0357de98079ac113b95195
+SIZE (mysql-5.1.28-rc.tar.gz) = 28021485
diff --git a/databases/mysql54-server/files/patch-client_mysql_upgrade.c b/databases/mysql54-server/files/patch-client_mysql_upgrade.c
deleted file mode 100644
index 14c5130605c7..000000000000
--- a/databases/mysql54-server/files/patch-client_mysql_upgrade.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- client/mysql_upgrade.c.orig	2008-01-29 22:42:00.000000000 +0100
-+++ client/mysql_upgrade.c	2008-02-14 08:29:52.000000000 +0100
-@@ -427,10 +427,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
-   */
diff --git a/databases/mysql54-server/files/patch-mysys_default.c b/databases/mysql54-server/files/patch-mysys_default.c
index a202932767ea..d9fa1b430881 100644
--- a/databases/mysql54-server/files/patch-mysys_default.c
+++ b/databases/mysql54-server/files/patch-mysys_default.c
@@ -1,6 +1,6 @@
---- mysys/default.c.orig	2008-04-08 13:23:13.000000000 +0200
-+++ mysys/default.c	2008-04-21 19:20:44.000000000 +0200
-@@ -623,7 +623,7 @@
+--- mysys/default.c.orig	2008-08-28 17:40:47.000000000 +0200
++++ mysys/default.c	2008-09-16 08:20:23.000000000 +0200
+@@ -638,7 +638,7 @@
    {
      MY_STAT stat_info;
      if (!my_stat(name,&stat_info,MYF(0)))
@@ -9,11 +9,14 @@
      /*
        Ignore world-writable regular files.
        This is mainly done to protect us to not read a file created by
-@@ -1105,6 +1105,7 @@
- #ifdef DEFAULT_SYSCONFDIR
+@@ -1091,7 +1091,10 @@
+ 
+ #if defined(DEFAULT_SYSCONFDIR)
    if (DEFAULT_SYSCONFDIR != "")
-     ADD_DIRECTORY(DEFAULT_SYSCONFDIR);
-+    ADD_DIRECTORY(DEFAULT_SYSCONFDIR "/mysql/");
++  {
+     errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
++    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "mysql", dirs);
++  }
+ #endif /* DEFAULT_SYSCONFDIR */
+ 
  #endif
-   ADD_COMMON_DIRECTORIES();
-   ADD_DIRECTORY("~/");