From 4ddf65715fd6556c23a832a38cf1d9a26a293660 Mon Sep 17 00:00:00 2001 From: Alex Dupre Date: Tue, 12 Jul 2011 14:44:51 +0000 Subject: [PATCH] Update to 5.5.14 release. --- databases/mysql55-client/pkg-plist | 1 + databases/mysql55-server/Makefile | 2 +- databases/mysql55-server/distinfo | 4 ++-- .../mysql55-server/files/patch-cmake_plugin.cmake | 12 ++++++------ databases/percona55-client/pkg-plist | 1 + databases/percona55-server/Makefile | 2 +- databases/percona55-server/distinfo | 4 ++-- .../percona55-server/files/patch-cmake_plugin.cmake | 12 ++++++------ 8 files changed, 20 insertions(+), 18 deletions(-) diff --git a/databases/mysql55-client/pkg-plist b/databases/mysql55-client/pkg-plist index 11301578ec16..0543f2cfbca3 100644 --- a/databases/mysql55-client/pkg-plist +++ b/databases/mysql55-client/pkg-plist @@ -47,6 +47,7 @@ include/mysql/mysql/service_thd_alloc.h include/mysql/mysql/service_thd_wait.h include/mysql/mysql/service_thread_scheduler.h include/mysql/mysql/services.h +include/mysql/mysql/thread_pool_priv.h include/mysql/mysql.h include/mysql/mysql_com.h include/mysql/mysql_embed.h diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 39d9cceb4083..8e79d36a43b2 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 5.5.13 +PORTVERSION= 5.5.14 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= ${MASTER_SITE_MYSQL} diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo index 70b1c6741a37..d1594acb47a4 100644 --- a/databases/mysql55-server/distinfo +++ b/databases/mysql55-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (mysql-5.5.13.tar.gz) = f05c5df8c53f85b094f415298eb8a7969e403604abc5a3b18ddd0e70e8b1d936 -SIZE (mysql-5.5.13.tar.gz) = 23709591 +SHA256 (mysql-5.5.14.tar.gz) = c7acab9ccb1e2598d079fe8b832281343c00b5b8032fcece37ef551b61980738 +SIZE (mysql-5.5.14.tar.gz) = 23772997 diff --git a/databases/mysql55-server/files/patch-cmake_plugin.cmake b/databases/mysql55-server/files/patch-cmake_plugin.cmake index 7013f2e8a14f..e5c97d0bdcdf 100644 --- a/databases/mysql55-server/files/patch-cmake_plugin.cmake +++ b/databases/mysql55-server/files/patch-cmake_plugin.cmake @@ -1,10 +1,10 @@ ---- cmake/plugin.cmake.orig 2011-04-12 09:41:40.000000000 +0200 -+++ cmake/plugin.cmake 2011-04-12 09:42:25.000000000 +0200 -@@ -179,7 +179,6 @@ +--- cmake/plugin.cmake.orig 2011-06-21 18:42:39.000000000 +0200 ++++ cmake/plugin.cmake 2011-07-12 09:24:41.000000000 +0200 +@@ -196,7 +196,6 @@ OUTPUT_NAME "${ARG_MODULE_OUTPUT_NAME}") # Install dynamic library MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT Server) - INSTALL_DEBUG_TARGET(${target} DESTINATION ${INSTALL_PLUGINDIR}/debug) - ELSE() - IF(WITHOUT_${plugin}) - # Update cache variable + # For internal testing in PB2, append collections files + IF(DEFINED ENV{PB2WORKDIR}) + PLUGIN_APPEND_COLLECTIONS(${plugin}) diff --git a/databases/percona55-client/pkg-plist b/databases/percona55-client/pkg-plist index 11301578ec16..0543f2cfbca3 100644 --- a/databases/percona55-client/pkg-plist +++ b/databases/percona55-client/pkg-plist @@ -47,6 +47,7 @@ include/mysql/mysql/service_thd_alloc.h include/mysql/mysql/service_thd_wait.h include/mysql/mysql/service_thread_scheduler.h include/mysql/mysql/services.h +include/mysql/mysql/thread_pool_priv.h include/mysql/mysql.h include/mysql/mysql_com.h include/mysql/mysql_embed.h diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index 39d9cceb4083..8e79d36a43b2 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 5.5.13 +PORTVERSION= 5.5.14 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= ${MASTER_SITE_MYSQL} diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo index 70b1c6741a37..d1594acb47a4 100644 --- a/databases/percona55-server/distinfo +++ b/databases/percona55-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (mysql-5.5.13.tar.gz) = f05c5df8c53f85b094f415298eb8a7969e403604abc5a3b18ddd0e70e8b1d936 -SIZE (mysql-5.5.13.tar.gz) = 23709591 +SHA256 (mysql-5.5.14.tar.gz) = c7acab9ccb1e2598d079fe8b832281343c00b5b8032fcece37ef551b61980738 +SIZE (mysql-5.5.14.tar.gz) = 23772997 diff --git a/databases/percona55-server/files/patch-cmake_plugin.cmake b/databases/percona55-server/files/patch-cmake_plugin.cmake index 7013f2e8a14f..e5c97d0bdcdf 100644 --- a/databases/percona55-server/files/patch-cmake_plugin.cmake +++ b/databases/percona55-server/files/patch-cmake_plugin.cmake @@ -1,10 +1,10 @@ ---- cmake/plugin.cmake.orig 2011-04-12 09:41:40.000000000 +0200 -+++ cmake/plugin.cmake 2011-04-12 09:42:25.000000000 +0200 -@@ -179,7 +179,6 @@ +--- cmake/plugin.cmake.orig 2011-06-21 18:42:39.000000000 +0200 ++++ cmake/plugin.cmake 2011-07-12 09:24:41.000000000 +0200 +@@ -196,7 +196,6 @@ OUTPUT_NAME "${ARG_MODULE_OUTPUT_NAME}") # Install dynamic library MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT Server) - INSTALL_DEBUG_TARGET(${target} DESTINATION ${INSTALL_PLUGINDIR}/debug) - ELSE() - IF(WITHOUT_${plugin}) - # Update cache variable + # For internal testing in PB2, append collections files + IF(DEFINED ENV{PB2WORKDIR}) + PLUGIN_APPEND_COLLECTIONS(${plugin})