5 files changed, 44 insertions, 6 deletions

diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 0389e781ee7e..f696c21399a0 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.20
+PORTVERSION=	5.1.21
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -19,6 +19,7 @@ COMMENT?=	Multithreaded SQL database (server)
 
 SLAVEDIRS=	databases/mysql51-client databases/mysql51-scripts
 USE_AUTOTOOLS=	libtool:15
+USE_GMAKE=	yes
 
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo
index 846b3e6cd4cc..40b5880fe8ab 100644
--- a/databases/mysql60-server/distinfo
+++ b/databases/mysql60-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.20-beta.tar.gz) = 1a3883347040de3990c152d7aceabccb
-SHA256 (mysql-5.1.20-beta.tar.gz) = 6f852c5d6fad17799cf125d19bb5e333e59b14e1d2aa8c85058990082de927d8
-SIZE (mysql-5.1.20-beta.tar.gz) = 25615303
+MD5 (mysql-5.1.21-beta.tar.gz) = c8e428a526b21d53c494a75b0ee01ffb
+SHA256 (mysql-5.1.21-beta.tar.gz) = 7a63307446736692a2908fdb67d9f1b6fe1bfa3206f5686f1b12fc8d698fda58
+SIZE (mysql-5.1.21-beta.tar.gz) = 28306579
diff --git a/databases/mysql60-server/files/patch-client_mysql_upgrade.c b/databases/mysql60-server/files/patch-client_mysql_upgrade.c
new file mode 100644
index 000000000000..cc29b97ddc60
--- /dev/null
+++ b/databases/mysql60-server/files/patch-client_mysql_upgrade.c
@@ -0,0 +1,36 @@
+--- client/mysql_upgrade.c.orig	Tue Aug 28 11:16:33 2007
++++ client/mysql_upgrade.c	Tue Aug 28 11:22:24 2007
+@@ -395,7 +395,6 @@
+       path[0]= 0;
+     }
+   }
+-  do
+   {
+     size_t path_len;
+     DBUG_PRINT("enter", ("path: %s", path));
+@@ -411,22 +410,14 @@
+               path, "", MYF(MY_REPLACE_DIR));
+ 
+     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, otherwise try again
+-      in higher level directory
+-    */
+   }
+-  while(run_tool(tool_path,
++  if(run_tool(tool_path,
+                  &ds_tmp, /* Get output from command, discard*/
+                  "--help",
+                  "2>&1",
+                  IF_WIN("> NUL", "> /dev/null"),
+-                 NULL));
++                 NULL))
++      die("Can't run '%s'", tool_path);
+ 
+   dynstr_free(&ds_tmp);
+ 
diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist
index 0f6b40cf3510..78edbfb25588 100644
--- a/databases/mysql60-server/pkg-plist
+++ b/databases/mysql60-server/pkg-plist
@@ -132,6 +132,7 @@ libexec/mysqld
 %%DATADIR%%/mysql_system_tables_data.sql
 %%DATADIR%%/mysql-log-rotate
 %%DATADIR%%/mysql.server
+%%DATADIR%%/mysqld_multi.server
 %%DATADIR%%/ndb-config-2-node.ini
 %%DATADIR%%/norwegian-ny/errmsg.sys
 %%DATADIR%%/norwegian/errmsg.sys
diff --git a/databases/mysql60-server/pkg-plist.client b/databases/mysql60-server/pkg-plist.client
index 7a5f116809d1..19c3949a63c4 100644
--- a/databases/mysql60-server/pkg-plist.client
+++ b/databases/mysql60-server/pkg-plist.client
@@ -46,11 +46,11 @@ include/mysql/typelib.h
 lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.la
 lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.15
+lib/mysql/libmysqlclient.so.16
 lib/mysql/libmysqlclient_r.a
 lib/mysql/libmysqlclient_r.la
 lib/mysql/libmysqlclient_r.so
-lib/mysql/libmysqlclient_r.so.15
+lib/mysql/libmysqlclient_r.so.16
 share/aclocal/mysql.m4
 %%DATADIR%%/mysql_fix_privilege_tables.sql
 @dirrm include/mysql