Update to 5.6.21-70.1

Update CONFLICTS [1]

PR:		194821 [1]
Submitted by:	Bernard Spil <spil.oss@gmail.com> [1]

5 files changed, 34 insertions, 32 deletions

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
@@ -2,7 +2,7 @@
 # $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/
@@ -63,7 +63,9 @@ CMAKE_ARGS+=	-DWITH_FAST_MUTEXES=1
 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
 
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,29 +1,30 @@
---- 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)
@@ -31,7 +32,7 @@
  
  # 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
  #
@@ -39,8 +40,10 @@
  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
@@ -40,6 +40,7 @@ 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
@@ -135,5 +136,15 @@ man/man8/mysqld.8.gz
 %%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