Update to 5.5.16 release.

svn path=/head/; revision=283107
2025-01-26 09:46:09 +00:00 · 2011-10-07 09:46:50 +00:00 · 2011-10-07 09:46:50 +00:00 · 7c285d8050 · 2021-03-31 03:12:20 +00:00
commit 7c285d8050
parent c6097e522e
14 changed files with 80 additions and 46 deletions
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@ -6,7 +6,6 @@
 #

 PORTNAME=	mysql
-PORTREVISION=	0
 PKGNAMESUFFIX=	-client

 COMMENT=	Multithreaded SQL database (client)
--- a/databases/mysql55-client/files/patch-client_CMakeLists.txt
+++ b/databases/mysql55-client/files/patch-client_CMakeLists.txt
@ -1,5 +1,5 @@
--- client/CMakeLists.txt.orig	2010-12-03 18:58:26.000000000 +0100
-+++ client/CMakeLists.txt	2010-12-23 15:19:07.000000000 +0100
+--- client/CMakeLists.txt.orig	2011-09-09 17:56:40.000000000 +0200
+++ client/CMakeLists.txt	2011-10-07 11:08:18.000000000 +0200
@@ -33,9 +33,11 @@
   TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
 ENDIF(UNIX)
@ -12,7 +12,7 @@
 
 
 MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
-@@ -47,9 +49,11 @@
+@@ -47,15 +49,19 @@
 MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
 TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
 
@ -24,12 +24,20 @@
 
 MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
 TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
-@@ -69,7 +73,7 @@
+ 
+IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
+ TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
+ENDIF()
+ 
+ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
+ TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
+@@ -72,7 +78,7 @@
   MYSQL_ADD_EXECUTABLE(echo echo.c)
 ENDIF(WIN32)
 
-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap 
-+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap 
+-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin 
+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap
 PROPERTIES HAS_CXX TRUE)
 
 ADD_DEFINITIONS(-DHAVE_DLOPEN)
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@ -6,8 +6,8 @@
 #

 PORTNAME?=	mysql
-PORTVERSION=	5.5.15
-PORTREVISION?=	1
+PORTVERSION=	5.5.16
+PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.5
--- a/databases/mysql55-server/distinfo
+++ b/databases/mysql55-server/distinfo
@ -1,2 +1,2 @@
-SHA256 (mysql-5.5.15.tar.gz) = bed15094b15bb89836c164b9d93eb8f3180caeb6017c8312e33a0c71eb9c5c82
-SIZE (mysql-5.5.15.tar.gz) = 23774015
+SHA256 (mysql-5.5.16.tar.gz) = 38a88d5f3a4e0ab1c6722662a2c858c63fd98f0925691400282cb23f1ea29b70
+SIZE (mysql-5.5.16.tar.gz) = 23816508
--- a/databases/mysql55-server/files/patch-client_CMakeLists.txt
+++ b/databases/mysql55-server/files/patch-client_CMakeLists.txt
@ -1,5 +1,5 @@
--- client/CMakeLists.txt.orig	2010-12-03 18:58:26.000000000 +0100
-+++ client/CMakeLists.txt	2010-12-23 18:01:04.000000000 +0100
+--- client/CMakeLists.txt.orig	2011-09-09 17:56:40.000000000 +0200
+++ client/CMakeLists.txt	2011-10-07 11:06:21.000000000 +0200
@@ -27,17 +27,20 @@
 
 ADD_DEFINITIONS(${READLINE_DEFINES})
@ -21,7 +21,7 @@
 MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
 TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
 
-@@ -46,11 +49,13 @@
+@@ -46,17 +49,21 @@
 
 MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
 TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
@ -34,8 +34,16 @@
 +IF(FALSE)
 MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
 TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
+ENDIF()
 
-@@ -63,13 +68,14 @@
+ MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
+ TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
+ 
+IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
+ TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
+ 
+@@ -66,13 +73,14 @@
 MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
 SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
 TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
@ -46,8 +54,8 @@
   MYSQL_ADD_EXECUTABLE(echo echo.c)
 ENDIF(WIN32)
 
-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap 
-+SET_TARGET_PROPERTIES (mysql_upgrade
+-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin 
+SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin
 PROPERTIES HAS_CXX TRUE)
 
 ADD_DEFINITIONS(-DHAVE_DLOPEN)
--- 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-06-21 18:42:39.000000000 +0200
-+++ cmake/plugin.cmake	2011-07-12 09:24:41.000000000 +0200
-@@ -196,7 +196,6 @@
+--- cmake/plugin.cmake.orig	2011-09-09 17:56:39.000000000 +0200
+++ cmake/plugin.cmake	2011-10-07 10:56:37.000000000 +0200
+@@ -195,7 +195,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)
-     # For internal testing in PB2, append collections files
-     IF(DEFINED ENV{PB2WORKDIR})
-       PLUGIN_APPEND_COLLECTIONS(${plugin})
+     # Add installed files to list for RPMs
+     FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
+             "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
--- a/databases/mysql55-server/pkg-plist
+++ b/databases/mysql55-server/pkg-plist
@ -8,6 +8,7 @@ bin/myisampack
 bin/mysql_convert_table_format
 bin/mysql_fix_extensions
 bin/mysql_install_db
+bin/mysql_plugin
 bin/mysql_secure_installation
 bin/mysql_setpermission
 bin/mysql_tzinfo_to_sql
@ -27,6 +28,7 @@ lib/mysql/libmysqld.a
 lib/mysql/plugin/adt_null.so
 lib/mysql/plugin/auth.so
 lib/mysql/plugin/auth_test_plugin.so
+lib/mysql/plugin/daemon_example.ini
 lib/mysql/plugin/ha_archive.so
 lib/mysql/plugin/ha_blackhole.so
 lib/mysql/plugin/ha_example.so
--- a/databases/percona55-client/Makefile
+++ b/databases/percona55-client/Makefile
@ -6,7 +6,6 @@
 #

 PORTNAME=	mysql
-PORTREVISION=	0
 PKGNAMESUFFIX=	-client

 COMMENT=	Multithreaded SQL database (client)
--- a/databases/percona55-client/files/patch-client_CMakeLists.txt
+++ b/databases/percona55-client/files/patch-client_CMakeLists.txt
@ -1,5 +1,5 @@
--- client/CMakeLists.txt.orig	2010-12-03 18:58:26.000000000 +0100
-+++ client/CMakeLists.txt	2010-12-23 15:19:07.000000000 +0100
+--- client/CMakeLists.txt.orig	2011-09-09 17:56:40.000000000 +0200
+++ client/CMakeLists.txt	2011-10-07 11:08:18.000000000 +0200
@@ -33,9 +33,11 @@
   TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
 ENDIF(UNIX)
@ -12,7 +12,7 @@
 
 
 MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
-@@ -47,9 +49,11 @@
+@@ -47,15 +49,19 @@
 MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
 TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
 
@ -24,12 +24,20 @@
 
 MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
 TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
-@@ -69,7 +73,7 @@
+ 
+IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
+ TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
+ENDIF()
+ 
+ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
+ TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
+@@ -72,7 +78,7 @@
   MYSQL_ADD_EXECUTABLE(echo echo.c)
 ENDIF(WIN32)
 
-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap 
-+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap 
+-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin 
+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap
 PROPERTIES HAS_CXX TRUE)
 
 ADD_DEFINITIONS(-DHAVE_DLOPEN)
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@ -6,8 +6,8 @@
 #

 PORTNAME?=	mysql
-PORTVERSION=	5.5.15
-PORTREVISION?=	1
+PORTVERSION=	5.5.16
+PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.5
--- a/databases/percona55-server/distinfo
+++ b/databases/percona55-server/distinfo
@ -1,2 +1,2 @@
-SHA256 (mysql-5.5.15.tar.gz) = bed15094b15bb89836c164b9d93eb8f3180caeb6017c8312e33a0c71eb9c5c82
-SIZE (mysql-5.5.15.tar.gz) = 23774015
+SHA256 (mysql-5.5.16.tar.gz) = 38a88d5f3a4e0ab1c6722662a2c858c63fd98f0925691400282cb23f1ea29b70
+SIZE (mysql-5.5.16.tar.gz) = 23816508
--- a/databases/percona55-server/files/patch-client_CMakeLists.txt
+++ b/databases/percona55-server/files/patch-client_CMakeLists.txt
@ -1,5 +1,5 @@
--- client/CMakeLists.txt.orig	2010-12-03 18:58:26.000000000 +0100
-+++ client/CMakeLists.txt	2010-12-23 18:01:04.000000000 +0100
+--- client/CMakeLists.txt.orig	2011-09-09 17:56:40.000000000 +0200
+++ client/CMakeLists.txt	2011-10-07 11:06:21.000000000 +0200
@@ -27,17 +27,20 @@
 
 ADD_DEFINITIONS(${READLINE_DEFINES})
@ -21,7 +21,7 @@
 MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
 TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
 
-@@ -46,11 +49,13 @@
+@@ -46,17 +49,21 @@
 
 MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
 TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
@ -34,8 +34,16 @@
 +IF(FALSE)
 MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
 TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
+ENDIF()
 
-@@ -63,13 +68,14 @@
+ MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
+ TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
+ 
+IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
+ TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
+ 
+@@ -66,13 +73,14 @@
 MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
 SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
 TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
@ -46,8 +54,8 @@
   MYSQL_ADD_EXECUTABLE(echo echo.c)
 ENDIF(WIN32)
 
-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap 
-+SET_TARGET_PROPERTIES (mysql_upgrade
+-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin 
+SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin
 PROPERTIES HAS_CXX TRUE)
 
 ADD_DEFINITIONS(-DHAVE_DLOPEN)
--- 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-06-21 18:42:39.000000000 +0200
-+++ cmake/plugin.cmake	2011-07-12 09:24:41.000000000 +0200
-@@ -196,7 +196,6 @@
+--- cmake/plugin.cmake.orig	2011-09-09 17:56:39.000000000 +0200
+++ cmake/plugin.cmake	2011-10-07 10:56:37.000000000 +0200
+@@ -195,7 +195,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)
-     # For internal testing in PB2, append collections files
-     IF(DEFINED ENV{PB2WORKDIR})
-       PLUGIN_APPEND_COLLECTIONS(${plugin})
+     # Add installed files to list for RPMs
+     FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
+             "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
--- a/databases/percona55-server/pkg-plist
+++ b/databases/percona55-server/pkg-plist
@ -8,6 +8,7 @@ bin/myisampack
 bin/mysql_convert_table_format
 bin/mysql_fix_extensions
 bin/mysql_install_db
+bin/mysql_plugin
 bin/mysql_secure_installation
 bin/mysql_setpermission
 bin/mysql_tzinfo_to_sql
@ -27,6 +28,7 @@ lib/mysql/libmysqld.a
 lib/mysql/plugin/adt_null.so
 lib/mysql/plugin/auth.so
 lib/mysql/plugin/auth_test_plugin.so
+lib/mysql/plugin/daemon_example.ini
 lib/mysql/plugin/ha_archive.so
 lib/mysql/plugin/ha_blackhole.so
 lib/mysql/plugin/ha_example.so