7 files changed, 36 insertions, 33 deletions

diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index b9839bde97cf..4698d46919bf 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.5.6
-PORTREVISION?=	1
+PORTVERSION=	5.5.7
+PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.5
diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo
index 01142b7f87c3..6740a21db711 100644
--- a/databases/mysql55-server/distinfo
+++ b/databases/mysql55-server/distinfo
@@ -1,3 +1,2 @@
-MD5 (mysql-5.5.6-rc.tar.gz) = 25cbd495e3aa87b4eb741b213b6dd990
-SHA256 (mysql-5.5.6-rc.tar.gz) = 1f96667a6a81b472ba3ee96a7dfaa99aec8cbd7a2f799be352235b24f7f309b8
-SIZE (mysql-5.5.6-rc.tar.gz) = 25596239
+SHA256 (mysql-5.5.7-rc.tar.gz) = f1c7c8ae7db509420a4b56fa541a334a0abfb976b98c66c07484b725fee12b0c
+SIZE (mysql-5.5.7-rc.tar.gz) = 25495029
diff --git a/databases/mysql55-server/files/patch-Makefile.in b/databases/mysql55-server/files/patch-Makefile.in
index e3b455b46425..7a16327dc95e 100644
--- a/databases/mysql55-server/files/patch-Makefile.in
+++ b/databases/mysql55-server/files/patch-Makefile.in
@@ -6,7 +6,7 @@
  
 -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
 -			@readline_topdir@ sql-common scripts \
--			@pstack_dir@ libservices \
+-			libservices \
 -			@sql_union_dirs@ unittest \
 -			@sql_server@ @man_dirs@ tests \
 -			@libmysqld_dirs@ \
diff --git a/databases/mysql55-server/files/patch-configure.am b/databases/mysql55-server/files/patch-configure.am
index dc3b5661fe37..6b36fbea8ec8 100644
--- a/databases/mysql55-server/files/patch-configure.am
+++ b/databases/mysql55-server/files/patch-configure.am
@@ -1,15 +1,6 @@
---- configure.am.orig	2010-09-17 22:48:48.000000000 +0200
-+++ configure.am	2010-09-27 16:39:47.000000000 +0200
-@@ -1011,6 +1011,8 @@
- MYSQL_BASE_VERSION
- MYSQL_NO_DASH_VERSION
- MYSQL_U_SCORE_VERSION
-+ndbcluster_includes
-+NDB_SCI_LIBS
- TEST_NDBCLUSTER
- MAKEINDEX
- PDFLATEX
-@@ -12717,7 +12719,7 @@
+--- configure.am.orig	2010-11-02 23:01:46.000000000 +0100
++++ configure.am	2010-11-10 16:31:42.000000000 +0100
+@@ -12722,7 +12722,7 @@
  _ACEOF
  
      case "$target_os" in
@@ -18,16 +9,7 @@
          HAVE_DTRACE_DASH_G="yes"
          ;;
        *)
-@@ -12750,6 +12752,8 @@
- NDB_VERSION_MINOR=`echo $MYSQL_NUMERIC_VERSION | cut -d. -f2`
- NDB_VERSION_BUILD=`echo $MYSQL_NUMERIC_VERSION | cut -d. -f3`
- NDB_VERSION_STATUS=`echo $VERSION | sed 's/^[-.0-9]*//'`
-+ndbcluster_includes=""
-+NDB_SCI_LIBS=""
- TEST_NDBCLUSTER=""
- 
- 
-@@ -25752,8 +25756,8 @@
+@@ -25432,8 +25432,8 @@
  # Some system specific hacks
  #
  
diff --git a/databases/mysql55-server/files/patch-mysys_default.c b/databases/mysql55-server/files/patch-mysys_default.c
index 507d31425c68..816105371bdf 100644
--- a/databases/mysql55-server/files/patch-mysys_default.c
+++ b/databases/mysql55-server/files/patch-mysys_default.c
@@ -1,6 +1,15 @@
---- mysys/default.c.orig	2009-03-31 16:38:43.000000000 +0200
-+++ mysys/default.c	2009-04-21 08:22:14.000000000 +0200
-@@ -679,7 +679,7 @@
+--- mysys/default.c.orig	2010-11-02 23:01:13.000000000 +0100
++++ mysys/default.c	2010-11-10 16:39:51.000000000 +0100
+@@ -70,7 +70,7 @@
+ 
+ /* Which directories are searched for options (and in which order) */
+ 
+-#define MAX_DEFAULT_DIRS 6
++#define MAX_DEFAULT_DIRS 7
+ #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
+ static const char **default_directories = NULL;
+ 
+@@ -711,7 +711,7 @@
    {
      MY_STAT stat_info;
      if (!my_stat(name,&stat_info,MYF(0)))
@@ -9,7 +18,7 @@
      /*
        Ignore world-writable regular files.
        This is mainly done to protect us to not read a file created by
-@@ -1128,7 +1128,10 @@
+@@ -1153,7 +1153,10 @@
  
  #if defined(DEFAULT_SYSCONFDIR)
    if (DEFAULT_SYSCONFDIR[0])
diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist
index 586dd08c8612..a3be0242fbf5 100644
--- a/databases/mysql55-server/pkg-plist
+++ b/databases/mysql55-server/pkg-plist
@@ -28,6 +28,14 @@ lib/mysql/libvio.a
 %%PLUGINS%%lib/mysql/plugin/adt_null.la
 %%PLUGINS%%lib/mysql/plugin/adt_null.so
 %%PLUGINS%%lib/mysql/plugin/adt_null.so.0
+%%PLUGINS%%lib/mysql/plugin/auth_test_plugin.a
+%%PLUGINS%%lib/mysql/plugin/auth_test_plugin.la
+%%PLUGINS%%lib/mysql/plugin/auth_test_plugin.so
+%%PLUGINS%%lib/mysql/plugin/auth_test_plugin.so.0
+%%PLUGINS%%lib/mysql/plugin/auth.a
+%%PLUGINS%%lib/mysql/plugin/auth.la
+%%PLUGINS%%lib/mysql/plugin/auth.so
+%%PLUGINS%%lib/mysql/plugin/auth.so.0
 %%PLUGINS%%lib/mysql/plugin/ha_example.a
 %%PLUGINS%%lib/mysql/plugin/ha_example.la
 %%PLUGINS%%lib/mysql/plugin/ha_example.so
@@ -118,7 +126,7 @@ libexec/mysqld
 %%DATADIR%%/swedish/errmsg.sys
 %%DATADIR%%/ukrainian/errmsg.sys
 @dirrmtry include/mysql
-%%PLUGINS%%@dirrm lib/mysql/plugin
+@dirrmtry lib/mysql/plugin
 @dirrmtry lib/mysql
 @dirrm %%DATADIR%%/charsets
 @dirrm %%DATADIR%%/czech
diff --git a/databases/mysql55-server/pkg-plist.client b/databases/mysql55-server/pkg-plist.client
index 18664bc22447..a374b9949e8c 100644
--- a/databases/mysql55-server/pkg-plist.client
+++ b/databases/mysql55-server/pkg-plist.client
@@ -10,6 +10,7 @@ bin/mysqlimport
 bin/mysqlshow
 bin/mysqlslap
 bin/mysqltest
+include/mysql/client_plugin.h
 include/mysql/decimal.h
 include/mysql/errmsg.h
 include/mysql/keycache.h
@@ -37,6 +38,8 @@ include/mysql/mysql_version.h
 include/mysql/mysqld_ername.h
 include/mysql/mysqld_error.h
 include/mysql/plugin_audit.h
+include/mysql/plugin_auth_common.h
+include/mysql/plugin_auth.h
 include/mysql/plugin_ftparser.h
 include/mysql/plugin.h
 include/mysql/probes_mysql.h
@@ -47,6 +50,8 @@ include/mysql/psi/psi.h
 include/mysql/services.h
 include/mysql/service_my_snprintf.h
 include/mysql/service_thd_alloc.h
+include/mysql/service_thd_wait.h
+include/mysql/service_thread_scheduler.h
 include/mysql/sql_common.h
 include/mysql/sql_state.h
 include/mysql/sslopt-case.h