Date: Thu, 14 Feb 2013 15:04:06 +0000 (UTC) From: Alex Dupre <ale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312234 - in head: Mk databases databases/mysql56-client databases/mysql56-client/files databases/mysql56-server databases/mysql56-server/files Message-ID: <201302141504.r1EF46rh051715@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ale Date: Thu Feb 14 15:04:05 2013 New Revision: 312234 URL: http://svnweb.freebsd.org/changeset/ports/312234 Log: Add MySQL 5.6. Added: head/databases/mysql56-client/ - copied from r311776, head/databases/mysql55-client/ head/databases/mysql56-client/files/patch-cmake_readline.cmake (contents, props changed) head/databases/mysql56-client/files/patch-mysys_ssl_my_default.cc - copied, changed from r311776, head/databases/mysql55-client/files/patch-mysys_default.c head/databases/mysql56-server/ - copied from r311776, head/databases/mysql55-server/ head/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc - copied, changed from r311776, head/databases/mysql55-server/files/patch-mysys_default.c head/databases/mysql56-server/files/patch-sql_mysqld.cc (contents, props changed) Deleted: head/databases/mysql56-client/files/patch-include_CMakeLists.txt head/databases/mysql56-client/files/patch-mysys_default.c head/databases/mysql56-server/files/patch-mysys_default.c Modified: head/Mk/bsd.database.mk head/databases/Makefile head/databases/mysql56-client/Makefile head/databases/mysql56-client/files/patch-CMakeLists.txt head/databases/mysql56-client/files/patch-client_CMakeLists.txt head/databases/mysql56-client/files/patch-extra_CMakeLists.txt head/databases/mysql56-client/files/patch-scripts_CMakeLists.txt head/databases/mysql56-client/files/patch-support-files_CMakeLists.txt head/databases/mysql56-client/pkg-plist head/databases/mysql56-server/Makefile head/databases/mysql56-server/distinfo head/databases/mysql56-server/files/patch-CMakeLists.txt head/databases/mysql56-server/files/patch-client_CMakeLists.txt head/databases/mysql56-server/files/patch-extra_CMakeLists.txt head/databases/mysql56-server/files/patch-include_CMakeLists.txt head/databases/mysql56-server/files/patch-scripts_CMakeLists.txt head/databases/mysql56-server/pkg-message head/databases/mysql56-server/pkg-plist Modified: head/Mk/bsd.database.mk ============================================================================== --- head/Mk/bsd.database.mk Thu Feb 14 14:55:05 2013 (r312233) +++ head/Mk/bsd.database.mk Thu Feb 14 15:04:05 2013 (r312234) @@ -112,6 +112,7 @@ MYSQL53m_LIBVER= 16 MYSQL55_LIBVER= 18 MYSQL55m_LIBVER= 18 MYSQL55p_LIBVER= 18 +MYSQL56_LIBVER= 18 MYSQL56p_LIBVER= 18 # Setting/finding MySQL version we want. Modified: head/databases/Makefile ============================================================================== --- head/databases/Makefile Thu Feb 14 14:55:05 2013 (r312233) +++ head/databases/Makefile Thu Feb 14 15:04:05 2013 (r312234) @@ -237,6 +237,8 @@ SUBDIR += mysql51-server SUBDIR += mysql55-client SUBDIR += mysql55-server + SUBDIR += mysql56-client + SUBDIR += mysql56-server SUBDIR += mysqlard SUBDIR += mysqlbackup SUBDIR += mysqlcppapi Modified: head/databases/mysql56-client/Makefile ============================================================================== --- head/databases/mysql55-client/Makefile Wed Feb 6 15:42:16 2013 (r311776) +++ head/databases/mysql56-client/Makefile Thu Feb 14 15:04:05 2013 (r312234) @@ -1,30 +1,26 @@ -# New ports collection makefile for: MySQL-client -# Date created: 28 Jan 2006 -# Whom: Alex Dupre <ale@FreeBSD.org> -# +# Created by: Alex Dupre <ale@FreeBSD.org> # $FreeBSD$ -# PORTNAME= mysql PKGNAMESUFFIX= -client COMMENT= Multithreaded SQL database (client) -MASTERDIR= ${.CURDIR}/../mysql55-server +MASTERDIR= ${.CURDIR}/../mysql56-server PKGMESSAGE= mustnotexist PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist -LATEST_LINK= mysql55-client +LATEST_LINK= mysql56-client -CONFLICTS_INSTALL= mysql-client-[34].* mysql-client-5.[0-46-9].* mariadb-client-5.* percona-client-5.* +CONFLICTS_INSTALL= mysql-client-[34].* mysql-client-5.[0-57-9].* mariadb-client-5.* percona-client-5.* CMAKE_ARGS+= -DWITHOUT_SERVER=1 USE_LDCONFIG= ${PREFIX}/lib/mysql -MAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_find_rows.1 \ +MAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \ mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \ mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 Modified: head/databases/mysql56-client/files/patch-CMakeLists.txt ============================================================================== --- head/databases/mysql55-client/files/patch-CMakeLists.txt Wed Feb 6 15:42:16 2013 (r311776) +++ head/databases/mysql56-client/files/patch-CMakeLists.txt Thu Feb 14 15:04:05 2013 (r312234) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2012-12-10 07:16:24.000000000 +0100 -+++ CMakeLists.txt 2012-12-21 22:33:41.000000000 +0100 -@@ -305,31 +305,11 @@ +--- CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100 ++++ CMakeLists.txt 2013-02-13 14:18:37.000000000 +0100 +@@ -378,31 +378,11 @@ ENDIF() ADD_SUBDIRECTORY(extra) @@ -37,7 +37,15 @@ INCLUDE(cmake/abi_check.cmake) INCLUDE(cmake/tags.cmake) -@@ -373,11 +353,11 @@ +@@ -439,7 +419,6 @@ + SET(CPACK_GENERATOR "TGZ") + ENDIF() + ADD_SUBDIRECTORY(packaging/WiX) +-ADD_SUBDIRECTORY(packaging/solaris) + + # Create a single package with "make package" + # (see http://public.kitware.com/Bug/view.php?id=11452) +@@ -447,11 +426,11 @@ INCLUDE(CPack) IF(UNIX) @@ -50,7 +58,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -403,3 +383,4 @@ +@@ -477,3 +456,4 @@ PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() Modified: head/databases/mysql56-client/files/patch-client_CMakeLists.txt ============================================================================== --- head/databases/mysql55-client/files/patch-client_CMakeLists.txt Wed Feb 6 15:42:16 2013 (r311776) +++ head/databases/mysql56-client/files/patch-client_CMakeLists.txt Thu Feb 14 15:04:05 2013 (r312234) @@ -1,6 +1,6 @@ ---- 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 @@ +--- client/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 ++++ client/CMakeLists.txt 2013-02-13 10:36:50.000000000 +0100 +@@ -39,9 +39,11 @@ TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY}) ENDIF(UNIX) @@ -12,7 +12,7 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) -@@ -47,15 +49,19 @@ +@@ -53,15 +55,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) @@ -32,12 +32,12 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) -@@ -72,7 +78,7 @@ - MYSQL_ADD_EXECUTABLE(echo echo.c) +@@ -82,8 +88,6 @@ ENDIF(WIN32) --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) + SET_TARGET_PROPERTIES ( +- mysql_plugin +- mysql_upgrade + mysqlcheck + mysqldump + mysqlimport Added: head/databases/mysql56-client/files/patch-cmake_readline.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql56-client/files/patch-cmake_readline.cmake Thu Feb 14 15:04:05 2013 (r312234) @@ -0,0 +1,11 @@ +--- cmake/readline.cmake.orig 2013-02-13 11:49:33.000000000 +0100 ++++ cmake/readline.cmake 2013-02-13 11:49:56.000000000 +0100 +@@ -192,7 +192,7 @@ + IF(WITH_LIBEDIT) + MYSQL_USE_BUNDLED_LIBEDIT() + ELSE() +- FIND_SYSTEM_LIBEDIT(edit) ++ FIND_SYSTEM_LIBEDIT(readline) + IF(NOT_LIBEDIT_FOUND) + MESSAGE(FATAL_ERROR "Cannot find system libedit libraries.Use WITH_LIBEDIT") + ENDIF() Modified: head/databases/mysql56-client/files/patch-extra_CMakeLists.txt ============================================================================== --- head/databases/mysql55-client/files/patch-extra_CMakeLists.txt Wed Feb 6 15:42:16 2013 (r311776) +++ head/databases/mysql56-client/files/patch-extra_CMakeLists.txt Thu Feb 14 15:04:05 2013 (r312234) @@ -1,25 +1,25 @@ ---- extra/CMakeLists.txt.orig 2010-12-03 18:58:24.000000000 +0100 -+++ extra/CMakeLists.txt 2010-12-23 14:45:36.000000000 +0100 -@@ -50,6 +50,7 @@ - ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys - ${PROJECT_SOURCE_DIR}/sql/share/errmsg-utf8.txt) +--- extra/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 ++++ extra/CMakeLists.txt 2013-02-13 11:02:40.000000000 +0100 +@@ -60,6 +60,7 @@ + ENDIF() + +IF(FALSE) MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) - TARGET_LINK_LIBRARIES(my_print_defaults mysys) - -@@ -69,11 +70,14 @@ - - MYSQL_ADD_EXECUTABLE(replace replace.c) - TARGET_LINK_LIBRARIES(replace mysys) + TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) + SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX) +@@ -96,11 +97,14 @@ + MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES}) + TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl) + ENDIF() +ENDIF() + IF(UNIX) +IF(FALSE) - MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.c) - MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) - TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) + TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl) + SET_TARGET_PROPERTIES(resolve_stack_dump PROPERTIES LINKER_LANGUAGE CXX) +ENDIF() MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c) - TARGET_LINK_LIBRARIES(mysql_waitpid mysys) + TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl) Copied and modified: head/databases/mysql56-client/files/patch-mysys_ssl_my_default.cc (from r311776, head/databases/mysql55-client/files/patch-mysys_default.c) ============================================================================== --- head/databases/mysql55-client/files/patch-mysys_default.c Wed Feb 6 15:42:16 2013 (r311776, copy source) +++ head/databases/mysql56-client/files/patch-mysys_ssl_my_default.cc Thu Feb 14 15:04:05 2013 (r312234) @@ -1,6 +1,6 @@ ---- 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 @@ +--- mysys_ssl/my_default.cc.orig 2013-01-22 17:54:49.000000000 +0100 ++++ mysys_ssl/my_default.cc 2013-02-13 11:08:15.000000000 +0100 +@@ -119,7 +119,7 @@ /* Which directories are searched for options (and in which order) */ @@ -9,16 +9,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))) -- return 1; -+ return 0; - /* - Ignore world-writable regular files. - This is mainly done to protect us to not read a file created by -@@ -1153,7 +1153,10 @@ +@@ -1395,7 +1395,10 @@ #if defined(DEFAULT_SYSCONFDIR) if (DEFAULT_SYSCONFDIR[0]) @@ -29,3 +20,12 @@ #endif /* DEFAULT_SYSCONFDIR */ #endif +@@ -1466,7 +1469,7 @@ + MY_STAT stat_info; + + if (!my_stat(file_name,&stat_info,MYF(0))) +- return 1; ++ return 0; + /* + Ignore .mylogin.cnf file if not exclusively readable/writable + by current user. Modified: head/databases/mysql56-client/files/patch-scripts_CMakeLists.txt ============================================================================== --- head/databases/mysql55-client/files/patch-scripts_CMakeLists.txt Wed Feb 6 15:42:16 2013 (r311776) +++ head/databases/mysql56-client/files/patch-scripts_CMakeLists.txt Thu Feb 14 15:04:05 2013 (r312234) @@ -1,5 +1,5 @@ ---- scripts/CMakeLists.txt.orig 2010-12-03 18:58:26.000000000 +0100 -+++ scripts/CMakeLists.txt 2011-01-11 20:18:07.000000000 +0100 +--- scripts/CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100 ++++ scripts/CMakeLists.txt 2013-02-13 14:14:11.000000000 +0100 @@ -71,6 +71,7 @@ ) ENDIF() @@ -8,7 +8,7 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql -@@ -79,6 +80,7 @@ +@@ -80,6 +81,7 @@ ${FIX_PRIVILEGES_SQL} DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server ) @@ -16,7 +16,7 @@ # TCMalloc hacks IF(MALLOC_LIB) -@@ -138,6 +140,7 @@ +@@ -139,6 +141,7 @@ SET(HOSTNAME "hostname") SET(MYSQLD_USER "mysql") @@ -24,7 +24,7 @@ # Required for mysqlbug until autotools are deprecated, once done remove these # and expand default cmake variables SET(CC ${CMAKE_C_COMPILER}) -@@ -174,6 +177,7 @@ +@@ -175,6 +178,7 @@ DESTINATION ${INSTALL_BINDIR} COMPONENT Server ) @@ -32,15 +32,15 @@ ENDIF(UNIX) -@@ -198,6 +202,7 @@ +@@ -199,6 +203,7 @@ SET(localstatedir ${MYSQL_DATADIR}) ENDIF() -+IF() ++IF(FALSE) IF(UNIX) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh - ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) -@@ -215,6 +220,7 @@ + SET(EXT) + ELSE() +@@ -213,6 +218,7 @@ DESTINATION ${DEST} COMPONENT Server ) @@ -48,7 +48,7 @@ SET(prefix "${CMAKE_INSTALL_PREFIX}") -@@ -266,6 +272,8 @@ +@@ -264,6 +270,8 @@ GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) STRING(REGEX REPLACE "^lib" "" lib "${lib}") SET(${var} "${${var}}-l${lib} " ) @@ -57,13 +57,12 @@ ELSE() SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -318,18 +326,9 @@ +@@ -316,17 +324,9 @@ SET(BIN_SCRIPTS msql2mysql mysql_config - mysql_fix_extensions - mysql_setpermission -- mysql_secure_installation - mysql_zap mysqlaccess mysqlaccess.conf @@ -76,3 +75,19 @@ ) FOREACH(file ${BIN_SCRIPTS}) IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) +@@ -350,6 +350,7 @@ + ) + ENDFOREACH() + ++IF(FALSE) + # Input files with pl.in extension - drop the extension completely + SET(PLIN_FILES mysql_secure_installation) + FOREACH(file ${PLIN_FILES}) +@@ -362,6 +363,7 @@ + INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/${file} COMPONENT ${${file}_COMPONENT}) + ENDFOREACH() + ENDIF() ++ENDIF() + + # Install libgcc as mylibgcc.a + IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_FLAGS MATCHES "-static") Modified: head/databases/mysql56-client/files/patch-support-files_CMakeLists.txt ============================================================================== --- head/databases/mysql55-client/files/patch-support-files_CMakeLists.txt Wed Feb 6 15:42:16 2013 (r311776) +++ head/databases/mysql56-client/files/patch-support-files_CMakeLists.txt Thu Feb 14 15:04:05 2013 (r312234) @@ -1,25 +1,24 @@ ---- support-files/CMakeLists.txt.orig 2011-01-19 23:37:09.000000000 +0100 -+++ support-files/CMakeLists.txt 2011-02-07 22:52:05.238344276 +0100 -@@ -40,15 +40,18 @@ +--- support-files/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 ++++ support-files/CMakeLists.txt 2013-02-13 11:13:32.000000000 +0100 +@@ -44,14 +44,17 @@ SET(inst_location ${INSTALL_SUPPORTFILESDIR}) ENDIF() +IF(FALSE) - FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh - ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} - DESTINATION ${inst_location} COMPONENT IniFiles) - ENDFOREACH() + SET(inifile my-default) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh + ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} + DESTINATION ${inst_location} COMPONENT IniFiles) +ENDIF() IF(UNIX) SET(prefix ${CMAKE_INSTALL_PREFIX}) +IF(FALSE) - FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure - config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini) + FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh -@@ -66,8 +69,10 @@ + ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) +@@ -68,8 +71,10 @@ IF(INSTALL_SUPPORTFILESDIR) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) ENDIF() @@ -29,8 +28,8 @@ +IF(FALSE) CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY) CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY) - CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.${VERSION}.spec @ONLY) -@@ -85,3 +90,4 @@ + +@@ -94,3 +99,4 @@ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ENDIF() Modified: head/databases/mysql56-client/pkg-plist ============================================================================== --- head/databases/mysql55-client/pkg-plist Wed Feb 6 15:42:16 2013 (r311776) +++ head/databases/mysql56-client/pkg-plist Thu Feb 14 15:04:05 2013 (r312234) @@ -1,6 +1,7 @@ bin/msql2mysql bin/mysql bin/mysql_config +bin/mysql_config_editor bin/mysql_find_rows bin/mysql_waitpid bin/mysqlaccess @@ -12,13 +13,19 @@ bin/mysqldump bin/mysqlimport bin/mysqlshow bin/mysqlslap +include/mysql/big_endian.h +include/mysql/byte_order_generic.h +include/mysql/byte_order_generic_x86.h +include/mysql/byte_order_generic_x86_64.h include/mysql/decimal.h include/mysql/errmsg.h include/mysql/keycache.h +include/mysql/little_endian.h include/mysql/m_ctype.h include/mysql/m_string.h include/mysql/my_alloc.h include/mysql/my_attribute.h +include/mysql/my_byteorder.h include/mysql/my_compiler.h include/mysql/my_config.h include/mysql/my_dbug.h @@ -30,31 +37,48 @@ include/mysql/my_net.h include/mysql/my_pthread.h include/mysql/my_sys.h include/mysql/my_xml.h +include/mysql/mysql.h +include/mysql/mysql/client_authentication.h include/mysql/mysql/client_plugin.h +include/mysql/mysql/client_plugin.h.pp +include/mysql/mysql/get_password.h include/mysql/mysql/innodb_priv.h include/mysql/mysql/plugin.h include/mysql/mysql/plugin_audit.h +include/mysql/mysql/plugin_audit.h.pp include/mysql/mysql/plugin_auth.h +include/mysql/mysql/plugin_auth.h.pp include/mysql/mysql/plugin_auth_common.h include/mysql/mysql/plugin_ftparser.h +include/mysql/mysql/plugin_ftparser.h.pp +include/mysql/mysql/plugin_validate_password.h include/mysql/mysql/psi/mysql_file.h +include/mysql/mysql/psi/mysql_idle.h +include/mysql/mysql/psi/mysql_socket.h +include/mysql/mysql/psi/mysql_stage.h +include/mysql/mysql/psi/mysql_statement.h +include/mysql/mysql/psi/mysql_table.h include/mysql/mysql/psi/mysql_thread.h include/mysql/mysql/psi/psi.h -include/mysql/mysql/psi/psi_abi_v1.h -include/mysql/mysql/psi/psi_abi_v2.h +include/mysql/mysql/service_my_plugin_log.h include/mysql/mysql/service_my_snprintf.h +include/mysql/mysql/service_mysql_string.h 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_com_server.h include/mysql/mysql_embed.h include/mysql/mysql_time.h include/mysql/mysql_version.h include/mysql/mysqld_ername.h include/mysql/mysqld_error.h +include/mysql/plugin.h +include/mysql/plugin_audit.h +include/mysql/plugin_ftparser.h +include/mysql/plugin_validate_password.h include/mysql/sql_common.h include/mysql/sql_state.h include/mysql/sslopt-case.h Modified: head/databases/mysql56-server/Makefile ============================================================================== --- head/databases/mysql55-server/Makefile Wed Feb 6 15:42:16 2013 (r311776) +++ head/databases/mysql56-server/Makefile Thu Feb 14 15:04:05 2013 (r312234) @@ -2,25 +2,19 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.5.30 +PORTVERSION= 5.6.10 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= ${MASTER_SITE_MYSQL} -MASTER_SITE_SUBDIR= MySQL-5.5 +MASTER_SITE_SUBDIR= MySQL-5.6 PKGNAMESUFFIX?= -server MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) -SLAVEDIRS= databases/mysql55-client +SLAVEDIRS= databases/mysql56-client USE_CMAKE= yes MAKE_JOBS_SAFE= yes -NO_OPTIONS_SORT=yes - -OPTIONS_DEFINE= SSL FASTMTX -OPTIONS_DEFAULT=SSL - -FASTMTX_DESC= Replace mutexes with spinlocks CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ @@ -44,23 +38,14 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MSSL} -CMAKE_ARGS+= -DWITH_SSL=bundled -.endif -.if ${PORT_OPTIONS:MFASTMTX} -CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1 -.endif - # MySQL-Server part .if !defined(CLIENT_ONLY) USE_MYSQL= yes -WANT_MYSQL_VER= 55 +WANT_MYSQL_VER= 56 -LATEST_LINK= mysql55-server +LATEST_LINK= mysql56-server -CONFLICTS_INSTALL= mysql-server-[34].* mysql-server-5.[0-46-9].* mariadb-server-5.* percona-server-5.* +CONFLICTS_INSTALL= mysql-server-[34].* mysql-server-5.[0-57-9].* mariadb-server-5.* percona-server-5.* USE_RC_SUBR= mysql-server Modified: head/databases/mysql56-server/distinfo ============================================================================== --- head/databases/mysql55-server/distinfo Wed Feb 6 15:42:16 2013 (r311776) +++ head/databases/mysql56-server/distinfo Thu Feb 14 15:04:05 2013 (r312234) @@ -1,2 +1,2 @@ -SHA256 (mysql-5.5.30.tar.gz) = 909fe596e0044082a02d2757b742a33b8a3ff399b589603940494d3d3d975053 -SIZE (mysql-5.5.30.tar.gz) = 24499036 +SHA256 (mysql-5.6.10.tar.gz) = 156c43a7bde1ada8552938c6b8f46162b568bca8ddb76998a645308d93fb70b6 +SIZE (mysql-5.6.10.tar.gz) = 35174149 Modified: head/databases/mysql56-server/files/patch-CMakeLists.txt ============================================================================== --- head/databases/mysql55-server/files/patch-CMakeLists.txt Wed Feb 6 15:42:16 2013 (r311776) +++ head/databases/mysql56-server/files/patch-CMakeLists.txt Thu Feb 14 15:04:05 2013 (r312234) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2010-12-03 18:58:24.000000000 +0100 -+++ CMakeLists.txt 2010-12-23 18:02:02.000000000 +0100 -@@ -293,7 +293,6 @@ +--- CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100 ++++ CMakeLists.txt 2013-02-13 14:40:46.000000000 +0100 +@@ -379,7 +379,6 @@ ADD_SUBDIRECTORY(extra) IF(NOT WITHOUT_SERVER) @@ -8,7 +8,7 @@ ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(sql) ADD_SUBDIRECTORY(sql/share) -@@ -301,14 +300,10 @@ +@@ -387,14 +386,10 @@ OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) IF(WITH_EMBEDDED_SERVER) ADD_SUBDIRECTORY(libmysqld) @@ -23,7 +23,15 @@ IF(UNIX) ADD_SUBDIRECTORY(man) ENDIF() -@@ -343,6 +338,7 @@ +@@ -439,7 +434,6 @@ + SET(CPACK_GENERATOR "TGZ") + ENDIF() + ADD_SUBDIRECTORY(packaging/WiX) +-ADD_SUBDIRECTORY(packaging/solaris) + + # Create a single package with "make package" + # (see http://public.kitware.com/Bug/view.php?id=11452) +@@ -452,6 +446,7 @@ # # RPM installs documentation directly from the source tree # @@ -31,7 +39,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -367,3 +363,4 @@ +@@ -477,3 +472,4 @@ PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() Modified: head/databases/mysql56-server/files/patch-client_CMakeLists.txt ============================================================================== --- head/databases/mysql55-server/files/patch-client_CMakeLists.txt Wed Feb 6 15:42:16 2013 (r311776) +++ head/databases/mysql56-server/files/patch-client_CMakeLists.txt Thu Feb 14 15:04:05 2013 (r312234) @@ -1,6 +1,6 @@ ---- 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 @@ +--- client/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 ++++ client/CMakeLists.txt 2013-02-13 14:47:51.000000000 +0100 +@@ -33,17 +33,20 @@ ADD_DEFINITIONS(${READLINE_DEFINES}) ADD_DEFINITIONS(${SSL_DEFINES}) @@ -21,7 +21,7 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) -@@ -46,17 +49,21 @@ +@@ -52,17 +55,21 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) @@ -43,19 +43,23 @@ 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) +@@ -75,6 +82,7 @@ + + MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) + TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) +ENDIF() # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". IF(WIN32) - MYSQL_ADD_EXECUTABLE(echo echo.c) - ENDIF(WIN32) - --SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin -+SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin +@@ -84,11 +92,6 @@ + SET_TARGET_PROPERTIES ( + mysql_plugin + mysql_upgrade +- mysqlcheck +- mysqldump +- mysqlimport +- mysqlshow +- mysqlslap PROPERTIES HAS_CXX TRUE) ADD_DEFINITIONS(-DHAVE_DLOPEN) Modified: head/databases/mysql56-server/files/patch-extra_CMakeLists.txt ============================================================================== --- head/databases/mysql55-server/files/patch-extra_CMakeLists.txt Wed Feb 6 15:42:16 2013 (r311776) +++ head/databases/mysql56-server/files/patch-extra_CMakeLists.txt Thu Feb 14 15:04:05 2013 (r312234) @@ -1,12 +1,13 @@ ---- extra/CMakeLists.txt.orig 2010-12-23 17:38:06.000000000 +0100 -+++ extra/CMakeLists.txt 2010-12-23 17:38:51.000000000 +0100 -@@ -75,7 +75,9 @@ - MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) - TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) +--- extra/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 ++++ extra/CMakeLists.txt 2013-02-13 14:35:11.000000000 +0100 +@@ -102,8 +102,10 @@ + TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl) + SET_TARGET_PROPERTIES(resolve_stack_dump PROPERTIES LINKER_LANGUAGE CXX) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c) - TARGET_LINK_LIBRARIES(mysql_waitpid mysys) + TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl) + SET_TARGET_PROPERTIES(mysql_waitpid PROPERTIES LINKER_LANGUAGE CXX) ENDIF() +ENDIF() Modified: head/databases/mysql56-server/files/patch-include_CMakeLists.txt ============================================================================== --- head/databases/mysql55-server/files/patch-include_CMakeLists.txt Wed Feb 6 15:42:16 2013 (r311776) +++ head/databases/mysql56-server/files/patch-include_CMakeLists.txt Thu Feb 14 15:04:05 2013 (r312234) @@ -1,10 +1,15 @@ ---- include/CMakeLists.txt.orig 2011-01-19 23:37:08.000000000 +0100 -+++ include/CMakeLists.txt 2011-02-07 22:40:32.698758463 +0100 -@@ -57,5 +57,7 @@ +--- include/CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100 ++++ include/CMakeLists.txt 2013-02-13 14:53:40.000000000 +0100 +@@ -65,10 +65,12 @@ ${HEADERS_GEN_CONFIGURE} ) +IF(FALSE) INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) - INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development FILES_MATCHING PATTERN "*.h") + INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development + PATTERN "*.h" + PATTERN "psi_abi*" EXCLUDE + ) +ENDIF() + + Copied and modified: head/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc (from r311776, head/databases/mysql55-server/files/patch-mysys_default.c) ============================================================================== --- head/databases/mysql55-server/files/patch-mysys_default.c Wed Feb 6 15:42:16 2013 (r311776, copy source) +++ head/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc Thu Feb 14 15:04:05 2013 (r312234) @@ -1,6 +1,6 @@ ---- 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 @@ +--- mysys_ssl/my_default.cc.orig 2013-01-22 17:54:49.000000000 +0100 ++++ mysys_ssl/my_default.cc 2013-02-13 11:08:15.000000000 +0100 +@@ -119,7 +119,7 @@ /* Which directories are searched for options (and in which order) */ @@ -9,16 +9,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))) -- return 1; -+ return 0; - /* - Ignore world-writable regular files. - This is mainly done to protect us to not read a file created by -@@ -1153,7 +1153,10 @@ +@@ -1395,7 +1395,10 @@ #if defined(DEFAULT_SYSCONFDIR) if (DEFAULT_SYSCONFDIR[0]) @@ -29,3 +20,12 @@ #endif /* DEFAULT_SYSCONFDIR */ #endif +@@ -1466,7 +1469,7 @@ + MY_STAT stat_info; + + if (!my_stat(file_name,&stat_info,MYF(0))) +- return 1; ++ return 0; + /* + Ignore .mylogin.cnf file if not exclusively readable/writable + by current user. Modified: head/databases/mysql56-server/files/patch-scripts_CMakeLists.txt ============================================================================== --- head/databases/mysql55-server/files/patch-scripts_CMakeLists.txt Wed Feb 6 15:42:16 2013 (r311776) +++ head/databases/mysql56-server/files/patch-scripts_CMakeLists.txt Thu Feb 14 15:04:05 2013 (r312234) @@ -1,6 +1,6 @@ ---- scripts/CMakeLists.txt.orig 2011-07-13 21:09:03.000000000 +0200 -+++ scripts/CMakeLists.txt 2011-09-01 09:48:22.000000000 +0200 -@@ -266,6 +266,8 @@ +--- scripts/CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100 ++++ scripts/CMakeLists.txt 2013-02-13 14:39:57.000000000 +0100 +@@ -264,6 +264,8 @@ GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) STRING(REGEX REPLACE "^lib" "" lib "${lib}") SET(${var} "${${var}}-l${lib} " ) @@ -9,7 +9,7 @@ ELSE() SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -316,16 +318,11 @@ +@@ -314,15 +316,10 @@ # On Unix, most of the files end up in the bin directory SET(mysql_config_COMPONENT COMPONENT Development) SET(BIN_SCRIPTS @@ -17,7 +17,6 @@ - mysql_config mysql_fix_extensions mysql_setpermission - mysql_secure_installation mysql_zap - mysqlaccess - mysqlaccess.conf @@ -26,7 +25,7 @@ mysqlhotcopy mysqldumpslow mysqld_multi -@@ -334,7 +331,7 @@ +@@ -331,7 +328,7 @@ FOREACH(file ${BIN_SCRIPTS}) IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh Added: head/databases/mysql56-server/files/patch-sql_mysqld.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql56-server/files/patch-sql_mysqld.cc Thu Feb 14 15:04:05 2013 (r312234) @@ -0,0 +1,11 @@ +--- sql/mysqld.cc.orig 2013-02-13 15:18:22.000000000 +0100 ++++ sql/mysqld.cc 2013-02-13 15:18:46.000000000 +0100 +@@ -6292,7 +6292,7 @@ + The connection was refused by TCP wrappers. + There are no details (by client IP) available to update the host_cache. + */ +- statistic_increment(connection_tcpwrap_errors, &LOCK_status); ++ statistic_increment(connection_errors_tcpwrap, &LOCK_status); + continue; + } + } Modified: head/databases/mysql56-server/pkg-message ============================================================================== --- head/databases/mysql55-server/pkg-message Wed Feb 6 15:42:16 2013 (r311776) +++ head/databases/mysql56-server/pkg-message Thu Feb 14 15:04:05 2013 (r312234) @@ -1,7 +1,6 @@ ************************************************************************ -Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag) -the first time you start the MySQL server after an upgrade from an -earlier version. +Remember to run mysql_upgrade the first time you start the MySQL server +after an upgrade from an earlier version. ************************************************************************ Modified: head/databases/mysql56-server/pkg-plist ============================================================================== --- head/databases/mysql55-server/pkg-plist Wed Feb 6 15:42:16 2013 (r311776) +++ head/databases/mysql56-server/pkg-plist Thu Feb 14 15:04:05 2013 (r312234) @@ -29,10 +29,6 @@ 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 -lib/mysql/plugin/ha_federated.so lib/mysql/plugin/libdaemon_example.so lib/mysql/plugin/mypluglib.so lib/mysql/plugin/qa_auth_client.so @@ -40,8 +36,10 @@ lib/mysql/plugin/qa_auth_interface.so lib/mysql/plugin/qa_auth_server.so lib/mysql/plugin/semisync_master.so lib/mysql/plugin/semisync_slave.so +lib/mysql/plugin/validate_password.so libexec/mysqld %%DATADIR%%/binary-configure +%%DATADIR%%/bulgarian/errmsg.sys %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README %%DATADIR%%/charsets/armscii8.xml @@ -68,11 +66,9 @@ libexec/mysqld %%DATADIR%%/charsets/macce.xml %%DATADIR%%/charsets/macroman.xml %%DATADIR%%/charsets/swe7.xml -%%DATADIR%%/config.huge.ini -%%DATADIR%%/config.medium.ini -%%DATADIR%%/config.small.ini %%DATADIR%%/czech/errmsg.sys %%DATADIR%%/danish/errmsg.sys +%%DATADIR%%/dictionary.txt %%DATADIR%%/dutch/errmsg.sys %%DATADIR%%/english/errmsg.sys %%DATADIR%%/errmsg-utf8.txt @@ -82,22 +78,19 @@ libexec/mysqld %%DATADIR%%/german/errmsg.sys %%DATADIR%%/greek/errmsg.sys %%DATADIR%%/hungarian/errmsg.sys +%%DATADIR%%/innodb_memcached_config.sql %%DATADIR%%/italian/errmsg.sys %%DATADIR%%/japanese/errmsg.sys %%DATADIR%%/korean/errmsg.sys %%DATADIR%%/magic -%%DATADIR%%/my-huge.cnf -%%DATADIR%%/my-innodb-heavy-4G.cnf -%%DATADIR%%/my-large.cnf -%%DATADIR%%/my-medium.cnf -%%DATADIR%%/my-small.cnf +%%DATADIR%%/my-default.cnf %%DATADIR%%/mysql-log-rotate %%DATADIR%%/mysql.server +%%DATADIR%%/mysql_security_commands.sql %%DATADIR%%/mysql_system_tables.sql %%DATADIR%%/mysql_system_tables_data.sql %%DATADIR%%/mysql_test_data_timezone.sql %%DATADIR%%/mysqld_multi.server -%%DATADIR%%/ndb-config-2-node.ini %%DATADIR%%/norwegian-ny/errmsg.sys %%DATADIR%%/norwegian/errmsg.sys %%DATADIR%%/polish/errmsg.sys @@ -111,6 +104,7 @@ libexec/mysqld %%DATADIR%%/ukrainian/errmsg.sys @dirrm lib/mysql/plugin @dirrmtry lib/mysql +@dirrm %%DATADIR%%/bulgarian @dirrm %%DATADIR%%/charsets @dirrm %%DATADIR%%/czech @dirrm %%DATADIR%%/danish
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302141504.r1EF46rh051715>