diff --git a/databases/percona56-client/Makefile b/databases/percona56-client/Makefile index 27844b8e9565..e8f1ec8b5744 100644 --- a/databases/percona56-client/Makefile +++ b/databases/percona56-client/Makefile @@ -1,35 +1,37 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME= percona PKGNAMESUFFIX= 56-client COMMENT= Multithreaded SQL database (client) MASTERDIR= ${.CURDIR}/../percona56-server PKGMESSAGE= mustnotexist PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist -CONFLICTS_INSTALL= mysql[0-9][0-9]-client-* mariadb[0-9][0-9]-client-* percona5.[0-57-9]-client-* percona[0-46-9][0-9]-client-* +CONFLICTS_INSTALL= mysql*-client-* \ + mariadb*-client-* \ + percona5[0-57-9]-client-* CMAKE_ARGS+= -DWITHOUT_SERVER=1 USE_LDCONFIG= ${PREFIX}/lib/mysql MANPAGES= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_find_rows.1 \ mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \ mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 CLIENT_ONLY= yes # Percona renamed the libraries, until we decide how to deal with it create some symlinks # to prevent breaking installed ports. post-install: ${LN} -s libperconaserverclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so ${LN} -s libperconaserverclient.so.18 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so.18 ${LN} -s libperconaserverclient_r.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so ${LN} -s libperconaserverclient_r.so.18 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.18 .include "${MASTERDIR}/Makefile" diff --git a/databases/percona56-client/files/patch-CMakeLists.txt b/databases/percona56-client/files/patch-CMakeLists.txt index 57b5c9c44684..669a43956e13 100644 --- a/databases/percona56-client/files/patch-CMakeLists.txt +++ b/databases/percona56-client/files/patch-CMakeLists.txt @@ -1,68 +1,70 @@ ---- CMakeLists.txt.orig 2013-11-17 18:02:53.000000000 +0000 -+++ CMakeLists.txt 2013-12-16 14:43:48.037159232 +0000 -@@ -458,33 +458,11 @@ - ENDIF() +--- CMakeLists.txt.orig 2014-10-06 18:06:02.000000000 +0200 ++++ CMakeLists.txt 2014-10-18 16:20:43.311977761 +0200 +@@ -500,39 +500,17 @@ ADD_SUBDIRECTORY(extra) + ADD_SUBDIRECTORY(client) +-ADD_SUBDIRECTORY(sql/share) + ADD_SUBDIRECTORY(libservices) ++ADD_SUBDIRECTORY(support-files) + + IF(UNIX) + ADD_SUBDIRECTORY(man) + ENDIF() + -IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(tests) -- ADD_SUBDIRECTORY(client) - ADD_SUBDIRECTORY(sql) -- ADD_SUBDIRECTORY(sql/share) -- ADD_SUBDIRECTORY(libservices) - OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) - IF(WITH_EMBEDDED_SERVER) - ADD_SUBDIRECTORY(libmysqld) - ADD_SUBDIRECTORY(libmysqld/examples) - ENDIF(WITH_EMBEDDED_SERVER) +-ENDIF() - + # scripts/mysql_config depends on client and server targets loaded above. + # It is referenced by some of the directories below, so we insert it here. + ADD_SUBDIRECTORY(scripts) + +-IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(mysql-test) - ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) - ADD_SUBDIRECTORY(support-files) -- ADD_SUBDIRECTORY(scripts) - ADD_SUBDIRECTORY(sql-bench) -- IF(UNIX) -- ADD_SUBDIRECTORY(man) -- ENDIF() - IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) - ADD_SUBDIRECTORY(internal) - ENDIF() -- ADD_SUBDIRECTORY(packaging/rpm-uln) - ADD_SUBDIRECTORY(packaging/rpm-oel) - ADD_SUBDIRECTORY(packaging/rpm-fedora) -ENDIF() -+ADD_SUBDIRECTORY(client) -+ADD_SUBDIRECTORY(libservices) -+ADD_SUBDIRECTORY(support-files) -+ADD_SUBDIRECTORY(scripts) -+ADD_SUBDIRECTORY(man) - +- INCLUDE(cmake/abi_check.cmake) INCLUDE(cmake/tags.cmake) -@@ -521,18 +499,17 @@ + +@@ -568,18 +546,17 @@ 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) SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "") IF(UNIX) - INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) ENDIF() # # RPM installs documentation directly from the source tree # +IF(FALSE) IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -558,5 +535,6 @@ +@@ -605,5 +582,6 @@ PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() +ENDIF() INCLUDE(CPack) diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile index cbffc5a3f9c4..94305079f68e 100644 --- a/databases/percona56-server/Makefile +++ b/databases/percona56-server/Makefile @@ -1,100 +1,102 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.6.19-67.0 +DISTVERSION= 5.6.21-70.1 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/ PKGNAMESUFFIX?= 56-server DISTNAME= percona-server-${DISTVERSION} MAINTAINER= flo@FreeBSD.org COMMENT?= Multithreaded SQL database (server) SLAVEDIRS= databases/percona56-client USES= bison cmake shebangfix OPTIONS_DEFINE= OPENSSL FASTMTX INNODBMEMCACHED OPTIONS_DEFAULT= OPENSSL INNODBMEMCACHED OPTIONS_SUB= yes FASTMTX_DESC= Replace mutexes with spinlocks INNODBMEMCACHED_DESC= InnoDB Memcached plugin INNODBMEMCACHED_CMAKE_ON=-DWITH_INNODB_MEMCACHED=1 DATADIR= ${PREFIX}/share/mysql CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="info" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_MANDIR="man" \ -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR="share/mysql" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DWITH_EDITLINE=system \ -DWITH_LIBWRAP=1 \ -DHAVE_PAM=0 SHEBANG_FILES= scripts/*.pl* scripts/*.sh .ifdef USE_MYSQL .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif .include .if ${PORT_OPTIONS:MOPENSSL} 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= 56p -CONFLICTS_INSTALL= mysql[0-9][0-9]-server-* mariadb[0-9][0-9]-server-* percona5.[0-57-9]-server-* percona[0-46-9][0-9]-server-* +CONFLICTS_INSTALL= mysql*-server-* \ + mariadb*-server-* \ + percona5[0-57-9]-server-* USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql INFO= mysql MANPAGES= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \ mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \ mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \ mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \ mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \ mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" post-install: @${MKDIR} ${STAGEDIR}/var/db/mysql .else USES+= readline .endif post-patch: @${REINPLACE_CMD} 's/*.1/${MANPAGES}/' ${WRKSRC}/man/CMakeLists.txt .include .if ${ARCH} == "arm" BROKEN= Does not compile on arm .endif .include diff --git a/databases/percona56-server/distinfo b/databases/percona56-server/distinfo index c13d4063a463..29a1b9058fbe 100644 --- a/databases/percona56-server/distinfo +++ b/databases/percona56-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (percona-server-5.6.19-67.0.tar.gz) = 5099e9d0ec69124f44596005a2dad92697dc2b6f8ab54d32bdb089945b76c346 -SIZE (percona-server-5.6.19-67.0.tar.gz) = 34127811 +SHA256 (percona-server-5.6.21-70.1.tar.gz) = 3f2ed35912a7a22f740be441078736e868a079b2f76e82988720e238b3ea8160 +SIZE (percona-server-5.6.21-70.1.tar.gz) = 33911244 diff --git a/databases/percona56-server/files/patch-CMakeLists.txt b/databases/percona56-server/files/patch-CMakeLists.txt index 4701b4cb09ef..0ee4f37e358a 100644 --- a/databases/percona56-server/files/patch-CMakeLists.txt +++ b/databases/percona56-server/files/patch-CMakeLists.txt @@ -1,46 +1,49 @@ ---- 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 @@ +--- CMakeLists.txt.orig 2014-10-06 18:06:02.000000000 +0200 ++++ CMakeLists.txt 2014-10-18 18:37:40.964417855 +0200 +@@ -508,12 +508,10 @@ + ENDIF() - ADD_SUBDIRECTORY(extra) IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(tests) - ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(sql) - ADD_SUBDIRECTORY(sql/share) -@@ -387,14 +386,10 @@ OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) IF(WITH_EMBEDDED_SERVER) ADD_SUBDIRECTORY(libmysqld) - ADD_SUBDIRECTORY(libmysqld/examples) ENDIF(WITH_EMBEDDED_SERVER) + ENDIF() + +@@ -522,10 +520,7 @@ + ADD_SUBDIRECTORY(scripts) + IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(mysql-test) - ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) ADD_SUBDIRECTORY(support-files) - ADD_SUBDIRECTORY(scripts) - ADD_SUBDIRECTORY(sql-bench) - IF(UNIX) - ADD_SUBDIRECTORY(man) + IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) + ADD_SUBDIRECTORY(internal) ENDIF() -@@ -439,7 +434,6 @@ +@@ -568,7 +563,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 @@ +@@ -580,6 +574,7 @@ # # RPM installs documentation directly from the source tree # +IF(FALSE) IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -477,3 +472,4 @@ +@@ -605,5 +600,6 @@ PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() +ENDIF() + + INCLUDE(CPack) diff --git a/databases/percona56-server/files/patch-plugin_innodb_memcached_innodb_memcache_src_innodb_engine.c b/databases/percona56-server/files/patch-plugin_innodb_memcached_innodb_memcache_src_innodb_engine.c deleted file mode 100644 index 01a1f23e81f7..000000000000 --- a/databases/percona56-server/files/patch-plugin_innodb_memcached_innodb_memcache_src_innodb_engine.c +++ /dev/null @@ -1,14 +0,0 @@ ---- plugin/innodb_memcached/innodb_memcache/src/innodb_engine.c.orig 2014-07-05 20:51:49.603580203 +0000 -+++ plugin/innodb_memcached/innodb_memcache/src/innodb_engine.c 2014-07-05 21:00:01.470581456 +0000 -@@ -791,6 +791,11 @@ - read_crsr = conn_data->read_crsr; - - if (lock_mode == IB_LOCK_TABLE_X) { -+ // Fixes a bug where using "flush all" would crash the server -+ if (ib_cb_trx_state(conn_data->crsr_trx) == IB_TRX_NOT_STARTED) { -+ ib_cb_trx_release(conn_data->crsr_trx); -+ conn_data->crsr_trx = NULL; -+ } - assert(!conn_data->crsr_trx); - - conn_data->crsr_trx = ib_cb_trx_begin( diff --git a/databases/percona56-server/pkg-plist b/databases/percona56-server/pkg-plist index 8305a90351f9..8079ead1b557 100644 --- a/databases/percona56-server/pkg-plist +++ b/databases/percona56-server/pkg-plist @@ -1,139 +1,150 @@ bin/innochecksum bin/my_print_defaults bin/myisam_ftdump bin/myisamchk bin/myisamlog 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 bin/mysql_upgrade bin/mysql_zap bin/mysqlbug bin/mysqld_multi bin/mysqld_safe bin/mysqldumpslow bin/mysqlhotcopy bin/mysqltest bin/perror bin/replace bin/resolve_stack_dump bin/resolveip lib/mysql/libmysqld.a lib/mysql/plugin/adt_null.so lib/mysql/plugin/audit_log.so lib/mysql/plugin/auth.so lib/mysql/plugin/auth_test_plugin.so lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/handlersocket.so %%INNODBMEMCACHED%%lib/mysql/plugin/innodb_engine.so lib/mysql/plugin/libdaemon_example.so lib/mysql/plugin/libfnv1a_udf.so lib/mysql/plugin/libfnv_udf.so %%INNODBMEMCACHED%%lib/mysql/plugin/libmemcached.so lib/mysql/plugin/libmurmur_udf.so lib/mysql/plugin/mypluglib.so lib/mysql/plugin/qa_auth_client.so lib/mysql/plugin/qa_auth_interface.so lib/mysql/plugin/qa_auth_server.so +lib/mysql/plugin/query_response_time.so lib/mysql/plugin/scalability_metrics.so lib/mysql/plugin/semisync_master.so lib/mysql/plugin/semisync_slave.so lib/mysql/plugin/validate_password.so libexec/mysqld man/man1/my_print_defaults.1.gz man/man1/myisam_ftdump.1.gz man/man1/myisamchk.1.gz man/man1/myisamlog.1.gz man/man1/myisampack.1.gz man/man1/mysql.server.1.gz man/man1/mysql_convert_table_format.1.gz man/man1/mysql_fix_extensions.1.gz man/man1/mysql_install_db.1.gz man/man1/mysql_plugin.1.gz man/man1/mysql_secure_installation.1.gz man/man1/mysql_setpermission.1.gz man/man1/mysql_tzinfo_to_sql.1.gz man/man1/mysql_upgrade.1.gz man/man1/mysql_zap.1.gz man/man1/mysqlbug.1.gz man/man1/mysqld_multi.1.gz man/man1/mysqld_safe.1.gz man/man1/mysqldumpslow.1.gz man/man1/mysqlhotcopy.1.gz man/man1/mysqlman.1.gz man/man1/mysqltest.1.gz man/man1/perror.1.gz man/man1/replace.1.gz man/man1/resolve_stack_dump.1.gz man/man1/resolveip.1.gz man/man8/mysqld.8.gz %%DATADIR%%/binary-configure %%DATADIR%%/bulgarian/errmsg.sys %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README %%DATADIR%%/charsets/armscii8.xml %%DATADIR%%/charsets/ascii.xml %%DATADIR%%/charsets/cp1250.xml %%DATADIR%%/charsets/cp1251.xml %%DATADIR%%/charsets/cp1256.xml %%DATADIR%%/charsets/cp1257.xml %%DATADIR%%/charsets/cp850.xml %%DATADIR%%/charsets/cp852.xml %%DATADIR%%/charsets/cp866.xml %%DATADIR%%/charsets/dec8.xml %%DATADIR%%/charsets/geostd8.xml %%DATADIR%%/charsets/greek.xml %%DATADIR%%/charsets/hebrew.xml %%DATADIR%%/charsets/hp8.xml %%DATADIR%%/charsets/keybcs2.xml %%DATADIR%%/charsets/koi8r.xml %%DATADIR%%/charsets/koi8u.xml %%DATADIR%%/charsets/latin1.xml %%DATADIR%%/charsets/latin2.xml %%DATADIR%%/charsets/latin5.xml %%DATADIR%%/charsets/latin7.xml %%DATADIR%%/charsets/macce.xml %%DATADIR%%/charsets/macroman.xml %%DATADIR%%/charsets/swe7.xml %%DATADIR%%/czech/errmsg.sys %%DATADIR%%/danish/errmsg.sys %%DATADIR%%/dictionary.txt %%DATADIR%%/dutch/errmsg.sys %%DATADIR%%/english/errmsg.sys %%DATADIR%%/errmsg-utf8.txt %%DATADIR%%/estonian/errmsg.sys %%DATADIR%%/fill_help_tables.sql %%DATADIR%%/french/errmsg.sys %%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-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%%/norwegian-ny/errmsg.sys %%DATADIR%%/norwegian/errmsg.sys %%DATADIR%%/polish/errmsg.sys %%DATADIR%%/portuguese/errmsg.sys %%DATADIR%%/romanian/errmsg.sys %%DATADIR%%/russian/errmsg.sys %%DATADIR%%/serbian/errmsg.sys %%DATADIR%%/slovak/errmsg.sys %%DATADIR%%/spanish/errmsg.sys %%DATADIR%%/swedish/errmsg.sys +%%DATADIR%%/tests/suite/query_response_time/basic.result +%%DATADIR%%/tests/suite/query_response_time/basic.test +%%DATADIR%%/tests/suite/query_response_time/query_response_time-stored.inc +%%DATADIR%%/tests/suite/query_response_time/query_response_time-stored.result +%%DATADIR%%/tests/suite/query_response_time/query_response_time-stored.test +%%DATADIR%%/tests/suite/query_response_time/query_response_time.inc +%%DATADIR%%/tests/suite/query_response_time/query_response_time.result +%%DATADIR%%/tests/suite/query_response_time/query_response_time.test +%%DATADIR%%/tests/suite/query_response_time/suite.opt +%%DATADIR%%/tests/suite/query_response_time/suite.pm %%DATADIR%%/ukrainian/errmsg.sys -@dir /var/db/mysql +@dir(mysql,mysql,) /var/db/mysql