[Midnightbsd-cvs] mports [23242] trunk/databases: add old percona version

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Apr 29 17:14:22 EDT 2018


Revision: 23242
          http://svnweb.midnightbsd.org/mports/?rev=23242
Author:   laffer1
Date:     2018-04-29 17:14:21 -0400 (Sun, 29 Apr 2018)
Log Message:
-----------
add old percona version

Modified Paths:
--------------
    trunk/databases/Makefile

Added Paths:
-----------
    trunk/databases/percona55-client/
    trunk/databases/percona55-client/Makefile
    trunk/databases/percona55-client/files/
    trunk/databases/percona55-client/files/patch-CMakeLists.txt
    trunk/databases/percona55-client/files/patch-client_CMakeLists.txt
    trunk/databases/percona55-client/files/patch-client__mysql.cc
    trunk/databases/percona55-client/files/patch-extra_CMakeLists.txt
    trunk/databases/percona55-client/files/patch-include_CMakeLists.txt
    trunk/databases/percona55-client/files/patch-include_my_compare.h
    trunk/databases/percona55-client/files/patch-include_myisam.h
    trunk/databases/percona55-client/files/patch-man_CMakeLists.txt
    trunk/databases/percona55-client/files/patch-mysys_default.c
    trunk/databases/percona55-client/files/patch-scripts_CMakeLists.txt
    trunk/databases/percona55-client/files/patch-support-files_CMakeLists.txt
    trunk/databases/percona55-client/pkg-message
    trunk/databases/percona55-client/pkg-plist
    trunk/databases/percona55-server/
    trunk/databases/percona55-server/Makefile
    trunk/databases/percona55-server/distinfo
    trunk/databases/percona55-server/files/
    trunk/databases/percona55-server/files/mysql-server.in
    trunk/databases/percona55-server/files/patch-CMakeLists.txt
    trunk/databases/percona55-server/files/patch-client_CMakeLists.txt
    trunk/databases/percona55-server/files/patch-cmake_plugin.cmake
    trunk/databases/percona55-server/files/patch-extra_CMakeLists.txt
    trunk/databases/percona55-server/files/patch-include_CMakeLists.txt
    trunk/databases/percona55-server/files/patch-include_my_compare.h
    trunk/databases/percona55-server/files/patch-include_myisam.h
    trunk/databases/percona55-server/files/patch-libmysql_CMakeLists.txt
    trunk/databases/percona55-server/files/patch-libservices_CMakeLists.txt
    trunk/databases/percona55-server/files/patch-man_CMakeLists.txt
    trunk/databases/percona55-server/files/patch-mysys_default.c
    trunk/databases/percona55-server/files/patch-scripts_CMakeLists.txt
    trunk/databases/percona55-server/files/patch-scripts_mysqld_safe.sh
    trunk/databases/percona55-server/files/patch-sql_CMakeLists.txt
    trunk/databases/percona55-server/files/patch-sql_sql_trigger.cc
    trunk/databases/percona55-server/files/patch-sql_sql_view.cc
    trunk/databases/percona55-server/files/patch-sql_sys_vars.cc
    trunk/databases/percona55-server/files/patch-storage__innobase__handler__i_s.cc
    trunk/databases/percona55-server/files/patch-support-files_CMakeLists.txt
    trunk/databases/percona55-server/pkg-descr
    trunk/databases/percona55-server/pkg-message
    trunk/databases/percona55-server/pkg-plist

Modified: trunk/databases/Makefile
===================================================================
--- trunk/databases/Makefile	2018-04-29 21:13:39 UTC (rev 23241)
+++ trunk/databases/Makefile	2018-04-29 21:14:21 UTC (rev 23242)
@@ -66,6 +66,8 @@
 SUBDIR += p5-SQL-Statement
 SUBDIR += p5-SQL-Translator
 SUBDIR += pecl-memcache
+SUBDIR += percona55-client
+SUBDIR += percona55-server
 SUBDIR += php56-dba
 SUBDIR += php56-mssql
 SUBDIR += php56-mysql

Added: trunk/databases/percona55-client/Makefile
===================================================================
--- trunk/databases/percona55-client/Makefile	                        (rev 0)
+++ trunk/databases/percona55-client/Makefile	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,41 @@
+# $FreeBSD: head/databases/percona55-client/Makefile 455167 2017-11-30 06:13:34Z linimon $
+
+PORTNAME=	percona
+PKGNAMESUFFIX=	55-client
+
+COMMENT=	Multithreaded SQL database (client)
+
+MASTERDIR=	${.CURDIR}/../percona55-server
+
+PKGMESSAGE=	${.CURDIR}/pkg-message
+PATCHDIR=	${.CURDIR}/files
+PLIST=		${.CURDIR}/pkg-plist
+
+CONFLICTS_INSTALL=	mysql*-client-* \
+			mariadb*-client-* \
+			percona5[0-46-9]-client-*
+
+CMAKE_ARGS+=	-DWITHOUT_SERVER=1
+CMAKE_ARGS+=	-DENABLE_DTRACE=OFF
+
+USE_LDCONFIG=	${PREFIX}/lib/mysql
+
+BROKEN_aarch64=		Fails to build: error: passing int to parameter of incompatible type va_list
+BROKEN_armv6=		Fails to build: error: passing int to parameter of incompatible type va_list
+BROKEN_armv7=		Fails to build: error: passing int to parameter of incompatible type va_list
+
+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"


Property changes on: trunk/databases/percona55-client/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-client/files/patch-CMakeLists.txt
===================================================================
--- trunk/databases/percona55-client/files/patch-CMakeLists.txt	                        (rev 0)
+++ trunk/databases/percona55-client/files/patch-CMakeLists.txt	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,72 @@
+--- CMakeLists.txt.orig	2015-11-02 16:25:51 UTC
++++ CMakeLists.txt
+@@ -403,33 +403,11 @@ IF(WITH_UNIT_TESTS)
+ ENDIF()
+ 
+ ADD_SUBDIRECTORY(extra)
+-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)
+-
+-  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-oel)
+-  ADD_SUBDIRECTORY(packaging/rpm-sles)
+-  ADD_SUBDIRECTORY(packaging/rpm-docker)
+-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)
+@@ -466,19 +444,21 @@ IF(WIN32)
+ ELSE()
+   SET(CPACK_GENERATOR "TGZ")
+ ENDIF() 
++IF(FALSE)
+ ADD_SUBDIRECTORY(packaging/WiX)
+ ADD_SUBDIRECTORY(packaging/solaris)
++ENDIF() 
+ 
+ # 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} 
+@@ -504,6 +484,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+     PATTERN "sp-imp-spec.txt" EXCLUDE
+   )
+ ENDIF()
++ENDIF()
+ 
+ INCLUDE(CPack)
+ 


Property changes on: trunk/databases/percona55-client/files/patch-CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-client/files/patch-client_CMakeLists.txt
===================================================================
--- trunk/databases/percona55-client/files/patch-client_CMakeLists.txt	                        (rev 0)
+++ trunk/databases/percona55-client/files/patch-client_CMakeLists.txt	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,48 @@
+--- client/CMakeLists.txt.orig	2015-01-07 10:49:52.000000000 +0100
++++ client/CMakeLists.txt	2015-01-21 20:03:30.747577544 +0100
+@@ -33,6 +33,7 @@
+   TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
+ ENDIF(UNIX)
+ 
++IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
+ SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
+ # mysqltest has unused result errors, so we skip Werror
+@@ -42,7 +43,7 @@
+   ADD_COMPILE_FLAGS(mysqltest.cc COMPILE_FLAGS "-Wno-error")
+ ENDIF()
+ TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex)
+-
++ENDIF()
+ 
+ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
+ TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient)
+@@ -53,15 +54,19 @@
+ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
+ TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient)
+ 
++IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
+ TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient)
+ ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
++ENDIF()
+ 
+ MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
+ TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient)
+ 
++IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
+ TARGET_LINK_LIBRARIES(mysql_plugin perconaserverclient)
++ENDIF()
+ 
+ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc
+                      ../sql/rpl_filter.cc ../sql/sql_list.cc)
+@@ -79,7 +84,7 @@
+   MYSQL_ADD_EXECUTABLE(echo echo.c)
+ 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)


Property changes on: trunk/databases/percona55-client/files/patch-client_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-client/files/patch-client__mysql.cc
===================================================================
--- trunk/databases/percona55-client/files/patch-client__mysql.cc	                        (rev 0)
+++ trunk/databases/percona55-client/files/patch-client__mysql.cc	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,16 @@
+--- client/mysql.cc.orig	2012-02-27 19:15:22.271243107 +0000
++++ client/mysql.cc	2012-02-27 19:16:16.645241508 +0000
+@@ -1601,11 +1601,11 @@
+ #endif
+ 
+ #ifdef HAVE_READLINE
+-  printf("%s  Ver %s Distrib %s, for %s (%s) using %s %s\n",
++  printf("%s  Ver %s Distrib %s Percona, for %s (%s) using %s %s\n",
+ 	 my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE,
+          readline, rl_library_version);
+ #else
+-  printf("%s  Ver %s Distrib %s, for %s (%s)\n", my_progname, VER,
++  printf("%s  Ver %s Distrib %s Percona, for %s (%s)\n", my_progname, VER,
+ 	MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);
+ #endif
+ 


Property changes on: trunk/databases/percona55-client/files/patch-client__mysql.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-client/files/patch-extra_CMakeLists.txt
===================================================================
--- trunk/databases/percona55-client/files/patch-extra_CMakeLists.txt	                        (rev 0)
+++ trunk/databases/percona55-client/files/patch-extra_CMakeLists.txt	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,26 @@
+--- extra/CMakeLists.txt.orig	2015-07-25 11:30:53 UTC
++++ extra/CMakeLists.txt
+@@ -50,6 +50,7 @@ ADD_CUSTOM_TARGET(GenError
+                   ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys 
+                   ${PROJECT_SOURCE_DIR}/sql/share/errmsg-utf8.txt)
+ 
++IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
+ TARGET_LINK_LIBRARIES(my_print_defaults  mysys)
+ 
+@@ -69,12 +70,15 @@ ENDIF()
+ 
+ MYSQL_ADD_EXECUTABLE(replace replace.c)
+ TARGET_LINK_LIBRARIES(replace mysys)
++ENDIF()
+ IF(UNIX)
++IF(FALSE)
+   MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.c)
+   TARGET_LINK_LIBRARIES(innochecksum ${ZLIB_LIBRARY})
+ 
+   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
+   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
++ENDIF()
+ 
+   MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)
+   TARGET_LINK_LIBRARIES(mysql_waitpid mysys)


Property changes on: trunk/databases/percona55-client/files/patch-extra_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-client/files/patch-include_CMakeLists.txt
===================================================================
--- trunk/databases/percona55-client/files/patch-include_CMakeLists.txt	                        (rev 0)
+++ trunk/databases/percona55-client/files/patch-include_CMakeLists.txt	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,12 @@
+--- include/CMakeLists.txt.orig	2011-01-19 23:37:08.000000000 +0100
++++ include/CMakeLists.txt	2011-02-07 22:42:05.129894470 +0100
+@@ -27,9 +27,6 @@
+   my_list.h
+   my_alloc.h
+   typelib.h 
+-  mysql/plugin.h
+-  mysql/plugin_audit.h
+-  mysql/plugin_ftparser.h
+ )
+ 
+ SET(HEADERS 


Property changes on: trunk/databases/percona55-client/files/patch-include_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-client/files/patch-include_my_compare.h
===================================================================
--- trunk/databases/percona55-client/files/patch-include_my_compare.h	                        (rev 0)
+++ trunk/databases/percona55-client/files/patch-include_my_compare.h	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,11 @@
+--- include/my_compare.h.orig	2011-05-10 09:46:46.000000000 +0200
++++ include/my_compare.h	2011-05-10 09:47:01.000000000 +0200
+@@ -39,7 +39,7 @@
+   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
+ */
+ 
+-#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
++#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
+ #define HA_MAX_KEY_SEG              16          /* Max segments for key */
+ 
+ #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)


Property changes on: trunk/databases/percona55-client/files/patch-include_my_compare.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-client/files/patch-include_myisam.h
===================================================================
--- trunk/databases/percona55-client/files/patch-include_myisam.h	                        (rev 0)
+++ trunk/databases/percona55-client/files/patch-include_myisam.h	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,11 @@
+--- include/myisam.h.orig	2009-02-16 23:04:54.000000000 +0100
++++ include/myisam.h	2009-02-16 23:10:08.000000000 +0100
+@@ -48,7 +48,7 @@
+   The following defines can be increased if necessary.
+   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
+ */
+-#define MI_MAX_KEY_LENGTH           1000            /* Max length in bytes */
++#define MI_MAX_KEY_LENGTH           4000            /* Max length in bytes */
+ #define MI_MAX_KEY_SEG              16              /* Max segments for key */
+ 
+ #define MI_MAX_KEY_BUFF  (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)


Property changes on: trunk/databases/percona55-client/files/patch-include_myisam.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-client/files/patch-man_CMakeLists.txt
===================================================================
--- trunk/databases/percona55-client/files/patch-man_CMakeLists.txt	                        (rev 0)
+++ trunk/databases/percona55-client/files/patch-man_CMakeLists.txt	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,13 @@
+--- man/CMakeLists.txt.orig	2011-10-22 14:08:32.000000000 +0200
++++ man/CMakeLists.txt	2011-10-22 14:22:42.000000000 +0200
+@@ -15,10 +15,6 @@
+ 
+ # Copy man pages
+ FILE(GLOB MAN1_FILES *.1)
+-FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
+-FILE(GLOB MAN1_NDB ndb*.1)
+-FILE(GLOB MAN8_FILES *.8)
+-FILE(GLOB MAN8_NDB ndb*.8)
+ IF(MAN1_FILES)
+   IF(MAN1_EXCLUDE)
+     LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE})


Property changes on: trunk/databases/percona55-client/files/patch-man_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-client/files/patch-mysys_default.c
===================================================================
--- trunk/databases/percona55-client/files/patch-mysys_default.c	                        (rev 0)
+++ trunk/databases/percona55-client/files/patch-mysys_default.c	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,31 @@
+--- 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 @@
+ 
+ /* Which directories are searched for options (and in which order) */
+ 
+-#define MAX_DEFAULT_DIRS 6
++#define MAX_DEFAULT_DIRS 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 @@
+ 
+ #if defined(DEFAULT_SYSCONFDIR)
+   if (DEFAULT_SYSCONFDIR[0])
++  {
+     errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
++    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
++  }
+ #endif /* DEFAULT_SYSCONFDIR */
+ 
+ #endif


Property changes on: trunk/databases/percona55-client/files/patch-mysys_default.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-client/files/patch-scripts_CMakeLists.txt
===================================================================
--- trunk/databases/percona55-client/files/patch-scripts_CMakeLists.txt	                        (rev 0)
+++ trunk/databases/percona55-client/files/patch-scripts_CMakeLists.txt	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,78 @@
+--- scripts/CMakeLists.txt.orig	2010-12-03 18:58:26.000000000 +0100
++++ scripts/CMakeLists.txt	2011-01-11 20:18:07.000000000 +0100
+@@ -71,6 +71,7 @@
+ )
+ ENDIF()
+ 
++IF(FALSE)
+ INSTALL(FILES 
+   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql 
+   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
+@@ -79,6 +80,7 @@
+   ${FIX_PRIVILEGES_SQL}
+   DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
+ )
++ENDIF()
+ 
+ # TCMalloc hacks
+ IF(MALLOC_LIB)
+@@ -138,6 +140,7 @@
+ SET(HOSTNAME "hostname")
+ SET(MYSQLD_USER "mysql")
+ 
++IF(FALSE)
+ # 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 @@
+   DESTINATION ${INSTALL_BINDIR}
+   COMPONENT Server
+   )
++ENDIF()
+ 
+ ENDIF(UNIX)
+ 
+@@ -198,6 +202,7 @@
+   SET(localstatedir ${MYSQL_DATADIR})
+ ENDIF()
+ 
++IF()
+ 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 @@
+   DESTINATION ${DEST}
+   COMPONENT Server
+   )
++ENDIF()
+ 
+ 
+ SET(prefix "${CMAKE_INSTALL_PREFIX}")
+@@ -266,6 +272,8 @@
+           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
+           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
+           SET(${var} "${${var}}-l${lib} " ) 
++        ELSEIF(lib STREQUAL "-pthread")
++          SET(${var} "${${var}}-pthread " ) 
+         ELSE()
+           SET(${var} "${${var}}-l${lib} " ) 
+         ENDIF()
+@@ -318,18 +326,9 @@
+   SET(BIN_SCRIPTS
+     msql2mysql
+     mysql_config
+-    mysql_fix_extensions
+-    mysql_setpermission
+-    mysql_secure_installation
+-    mysql_zap
+     mysqlaccess
+     mysqlaccess.conf
+-    mysql_convert_table_format
+     mysql_find_rows
+-    mysqlhotcopy
+-    mysqldumpslow
+-    mysqld_multi
+-    mysqld_safe
+   )
+   FOREACH(file ${BIN_SCRIPTS})
+     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)


Property changes on: trunk/databases/percona55-client/files/patch-scripts_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-client/files/patch-support-files_CMakeLists.txt
===================================================================
--- trunk/databases/percona55-client/files/patch-support-files_CMakeLists.txt	                        (rev 0)
+++ trunk/databases/percona55-client/files/patch-support-files_CMakeLists.txt	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,41 @@
+--- support-files/CMakeLists.txt.orig	2017-08-18 12:24:50 UTC
++++ support-files/CMakeLists.txt
+@@ -40,12 +40,14 @@ ELSE()
+   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()
++ENDIF()
+ 
+ IF(UNIX)
+   IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+@@ -54,6 +56,7 @@ IF(UNIX)
+     SET (PIDOF "pgrep -d' ' -f")
+   ENDIF()
+   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)
+     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
+@@ -73,8 +76,10 @@ IF(UNIX)
+   IF(INSTALL_SUPPORTFILESDIR)
+     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
+   ENDIF()
++ENDIF()
+ 
+   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
++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)
+   
+@@ -99,3 +104,4 @@ IF(UNIX)
+     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
+     GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ ENDIF()
++ENDIF()


Property changes on: trunk/databases/percona55-client/files/patch-support-files_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-client/pkg-message
===================================================================
--- trunk/databases/percona55-client/pkg-message	                        (rev 0)
+++ trunk/databases/percona55-client/pkg-message	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,15 @@
+* * * * * * * * * * * * * * * * * * * * * * * *
+
+Please be aware the database client is vulnerable
+to CVE-2015-3152 - SSL Downgrade aka "BACKRONYM".
+You may find more information at the following URL:
+
+http://www.vuxml.org/freebsd/36bd352d-299b-11e5-86ff-14dae9d210b8.html
+
+Although this database client is not listed as
+"affected", it is vulnerable and will not be
+receiving a patch. Please take note of this when
+deploying this software.
+
+* * * * * * * * * * * * * * * * * * * * * * * *
+


Property changes on: trunk/databases/percona55-client/pkg-message
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-client/pkg-plist
===================================================================
--- trunk/databases/percona55-client/pkg-plist	                        (rev 0)
+++ trunk/databases/percona55-client/pkg-plist	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,91 @@
+bin/msql2mysql
+bin/mysql
+bin/mysql_config
+bin/mysql_find_rows
+bin/mysql_waitpid
+bin/mysqlaccess
+bin/mysqlaccess.conf
+bin/mysqladmin
+bin/mysqlbinlog
+bin/mysqlcheck
+bin/mysqldump
+bin/mysqlimport
+bin/mysqlshow
+bin/mysqlslap
+include/mysql/decimal.h
+include/mysql/errmsg.h
+include/mysql/keycache.h
+include/mysql/m_ctype.h
+include/mysql/m_string.h
+include/mysql/my_alloc.h
+include/mysql/my_attribute.h
+include/mysql/my_compiler.h
+include/mysql/my_config.h
+include/mysql/my_dbug.h
+include/mysql/my_dir.h
+include/mysql/my_getopt.h
+include/mysql/my_global.h
+include/mysql/my_list.h
+include/mysql/my_net.h
+include/mysql/my_pthread.h
+include/mysql/my_sys.h
+include/mysql/my_xml.h
+include/mysql/mysql/client_plugin.h
+include/mysql/mysql/innodb_priv.h
+include/mysql/mysql/plugin.h
+include/mysql/mysql/plugin_audit.h
+include/mysql/mysql/plugin_auth.h
+include/mysql/mysql/plugin_auth_common.h
+include/mysql/mysql/plugin_ftparser.h
+include/mysql/mysql/psi/mysql_file.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_snprintf.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_embed.h
+include/mysql/mysql_time.h
+include/mysql/mysql_version.h
+include/mysql/mysqld_ername.h
+include/mysql/mysqld_error.h
+include/mysql/sql_common.h
+include/mysql/sql_state.h
+include/mysql/sslopt-case.h
+include/mysql/sslopt-longopts.h
+include/mysql/sslopt-vars.h
+include/mysql/typelib.h
+lib/mysql/libmysqlclient.so
+lib/mysql/libmysqlclient.so.18
+lib/mysql/libmysqlclient_r.so
+lib/mysql/libmysqlclient_r.so.18
+lib/mysql/libperconaserverclient.a
+lib/mysql/libperconaserverclient.so
+lib/mysql/libperconaserverclient.so.18
+lib/mysql/libperconaserverclient.so.18.0.0
+lib/mysql/libperconaserverclient_r.a
+lib/mysql/libperconaserverclient_r.so
+lib/mysql/libperconaserverclient_r.so.18
+lib/mysql/libperconaserverclient_r.so.18.0.0
+lib/mysql/libmysqlservices.a
+man/man1/comp_err.1.gz
+man/man1/msql2mysql.1.gz
+man/man1/mysql.1.gz
+man/man1/mysql_config.1.gz
+man/man1/mysql_find_rows.1.gz
+man/man1/mysql_waitpid.1.gz
+man/man1/mysqlaccess.1.gz
+man/man1/mysqladmin.1.gz
+man/man1/mysqlbinlog.1.gz
+man/man1/mysqlcheck.1.gz
+man/man1/mysqldump.1.gz
+man/man1/mysqlimport.1.gz
+man/man1/mysqlshow.1.gz
+man/man1/mysqlslap.1.gz
+share/aclocal/mysql.m4


Property changes on: trunk/databases/percona55-client/pkg-plist
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-server/Makefile
===================================================================
--- trunk/databases/percona55-server/Makefile	                        (rev 0)
+++ trunk/databases/percona55-server/Makefile	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,101 @@
+# $MidnightBSD$
+# $FreeBSD: head/databases/percona55-server/Makefile 461609 2018-02-12 18:31:47Z flo $
+
+PORTNAME?=	percona
+DISTVERSION=	5.5.59-38.11
+PORTREVISION?=	0
+CATEGORIES=	databases ipv6
+MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-${DISTVERSION}/source/tarball/
+PKGNAMESUFFIX?=	55-server
+DISTNAME=	percona-server-${DISTVERSION}
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT?=	Multithreaded SQL database (server)
+
+LICENSE=	gpl2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+SLAVEDIRS=	databases/percona55-client
+USES=		bison cmake:noninja readline shebangfix
+
+CXXFLAGS+=	${CPPFLAGS}
+
+OPTIONS_DEFINE=	OPENSSL FASTMTX
+OPTIONS_DEFAULT=	OPENSSL
+FASTMTX_DESC=	Replace mutexes with spinlocks
+
+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_LIBEDIT=0 \
+		-DWITH_LIBWRAP=1 \
+		-DHAVE_PAM=0 \
+		-DWITH_UNIT_TESTS=0 \
+		-DENABLE_DTRACE=OFF
+
+SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
+
+.include <bsd.mport.options.mk>
+
+.if ${PORT_OPTIONS:MOPENSSL}
+CMAKE_ARGS+=	-DWITH_SSL=system
+OPENSSL_USES=	ssl
+USE_OPENSSL=	yes
+.endif
+.if ${PORT_OPTIONS:MFASTMTX}
+CMAKE_ARGS+=	-DWITH_FAST_MUTEXES=1
+.endif
+
+# MySQL-Server part
+.if !defined(CLIENT_ONLY)
+USES+=mysql:55p
+
+CONFLICTS_INSTALL=	mysql*-server-* \
+			mysqlwsrep* \
+			mariadb*-server-* \
+			percona5[0-46-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
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} 's/*.1/${MANPAGES}/' ${WRKSRC}/man/CMakeLists.txt
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "arm"
+BROKEN=		Does not compile on arm
+.endif
+
+.include <bsd.port.post.mk>


Property changes on: trunk/databases/percona55-server/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-server/distinfo
===================================================================
--- trunk/databases/percona55-server/distinfo	                        (rev 0)
+++ trunk/databases/percona55-server/distinfo	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,3 @@
+TIMESTAMP = 1517405720
+SHA256 (percona-server-5.5.59-38.11.tar.gz) = 1be9a179c86fdf43e2374eb22aaece4ac9f93b4ea89d9c96a20d1b189f7be175
+SIZE (percona-server-5.5.59-38.11.tar.gz) = 23064594


Property changes on: trunk/databases/percona55-server/distinfo
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-server/files/mysql-server.in
===================================================================
--- trunk/databases/percona55-server/files/mysql-server.in	                        (rev 0)
+++ trunk/databases/percona55-server/files/mysql-server.in	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,79 @@
+#!/bin/sh
+#
+# $FreeBSD: head/databases/percona55-server/files/mysql-server.in 349059 2014-03-24 20:16:31Z flo $
+#
+
+# PROVIDE: mysql
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Add the following line to /etc/rc.conf to enable mysql:
+# mysql_enable (bool):	Set to "NO" by default.
+#			Set it to "YES" to enable MySQL.
+# mysql_limits (bool):	Set to "NO" by default.
+#			Set it to yes to run `limits -e -U mysql`
+#			just before mysql starts.
+# mysql_dbdir (str):	Default to "/var/db/mysql"
+#			Base database directory.
+# mysql_optfile (str):	Server-specific option file.
+#			Default to "${mysql_dbdir}/my.cnf".
+# mysql_pidfile (str):	Custum PID file path and name.
+#			Default to "${mysql_dbdir}/${hostname}.pid".
+# mysql_args (str):	Custom additional arguments to be passed
+#			to mysqld_safe (default empty).
+#
+
+. /etc/rc.subr
+
+name="mysql"
+rcvar=mysql_enable
+
+load_rc_config $name
+
+: ${mysql_enable="NO"}
+: ${mysql_limits="NO"}
+: ${mysql_dbdir="/var/db/mysql"}
+: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
+
+mysql_user="mysql"
+mysql_limits_args="-e -U ${mysql_user}"
+: ${hostname:=`/bin/hostname`}
+pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
+command="/usr/sbin/daemon"
+command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
+procname="%%PREFIX%%/libexec/mysqld"
+start_precmd="${name}_prestart"
+start_postcmd="${name}_poststart"
+mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
+mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --defaults-extra-file=${mysql_optfile} --force"
+
+mysql_create_auth_tables()
+{
+	eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
+        [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
+}
+
+mysql_prestart()
+{
+	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
+		mysql_create_auth_tables || return 1
+	fi
+	if checkyesno mysql_limits; then
+		eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
+	else
+		return 0
+	fi
+}
+
+mysql_poststart()
+{
+	local timeout=15
+	while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
+		timeout=$(( timeout - 1 ))
+		sleep 1
+	done
+	return 0
+}
+
+run_rc_command "$1"


Property changes on: trunk/databases/percona55-server/files/mysql-server.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-server/files/patch-CMakeLists.txt
===================================================================
--- trunk/databases/percona55-server/files/patch-CMakeLists.txt	                        (rev 0)
+++ trunk/databases/percona55-server/files/patch-CMakeLists.txt	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,49 @@
+--- CMakeLists.txt.orig	2013-05-16 17:47:15.000000000 +0200
++++ CMakeLists.txt	2013-06-12 09:41:06.000000000 +0200
+@@ -306,7 +306,6 @@
+ 
+ ADD_SUBDIRECTORY(extra)
+ IF(NOT WITHOUT_SERVER)
+-  ADD_SUBDIRECTORY(tests)
+   ADD_SUBDIRECTORY(client)
+   ADD_SUBDIRECTORY(sql)
+   ADD_SUBDIRECTORY(sql/share)
+@@ -314,14 +313,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)
+ 
+-  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()
+@@ -365,8 +360,10 @@
+ ELSE()
+   SET(CPACK_GENERATOR "TGZ")
+ ENDIF() 
++IF(FALSE)
+ ADD_SUBDIRECTORY(packaging/WiX)
+ ADD_SUBDIRECTORY(packaging/solaris)
++ENDIF() 
+ 
+ # Create a single package with "make package"
+ # (see http://public.kitware.com/Bug/view.php?id=11452)
+@@ -379,6 +376,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} 
+@@ -404,3 +402,4 @@
+     PATTERN "sp-imp-spec.txt" EXCLUDE
+   )
+ ENDIF()
++ENDIF()


Property changes on: trunk/databases/percona55-server/files/patch-CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-server/files/patch-client_CMakeLists.txt
===================================================================
--- trunk/databases/percona55-server/files/patch-client_CMakeLists.txt	                        (rev 0)
+++ trunk/databases/percona55-server/files/patch-client_CMakeLists.txt	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,62 @@
+--- client/CMakeLists.txt.orig	2015-01-07 10:49:52.000000000 +0100
++++ client/CMakeLists.txt	2015-01-21 20:06:10.493605146 +0100
+@@ -27,11 +27,13 @@
+ 
+ ADD_DEFINITIONS(${READLINE_DEFINES})
+ ADD_DEFINITIONS(${SSL_DEFINES})
++IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
+ TARGET_LINK_LIBRARIES(mysql perconaserverclient)
+ IF(UNIX)
+   TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
+ ENDIF(UNIX)
++ENDIF()
+ 
+ MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
+ SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
+@@ -44,6 +46,7 @@
+ TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex)
+ 
+ 
++IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
+ TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient)
+ 
+@@ -52,17 +55,21 @@
+ 
+ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
+ TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient)
++ENDIF()
+ 
+ MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
+ TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient)
+ ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
+ 
++IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
+ TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient)
++ENDIF()
+ 
+ MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
+ TARGET_LINK_LIBRARIES(mysql_plugin perconaserverclient)
+ 
++IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc
+                      ../sql/rpl_filter.cc ../sql/sql_list.cc)
+ TARGET_LINK_LIBRARIES(mysqlbinlog perconaserverclient)
+@@ -73,13 +80,14 @@
+ MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
+ SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
+ TARGET_LINK_LIBRARIES(mysqlslap perconaserverclient)
++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
+ PROPERTIES HAS_CXX TRUE)
+ 
+ ADD_DEFINITIONS(-DHAVE_DLOPEN)


Property changes on: trunk/databases/percona55-server/files/patch-client_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-server/files/patch-cmake_plugin.cmake
===================================================================
--- trunk/databases/percona55-server/files/patch-cmake_plugin.cmake	                        (rev 0)
+++ trunk/databases/percona55-server/files/patch-cmake_plugin.cmake	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,10 @@
+--- 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)
+     # 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"


Property changes on: trunk/databases/percona55-server/files/patch-cmake_plugin.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-server/files/patch-extra_CMakeLists.txt
===================================================================
--- trunk/databases/percona55-server/files/patch-extra_CMakeLists.txt	                        (rev 0)
+++ trunk/databases/percona55-server/files/patch-extra_CMakeLists.txt	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,12 @@
+--- 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)
+ 
++IF(FALSE)
+   MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)
+   TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
+ ENDIF()
++ENDIF()
+ 


Property changes on: trunk/databases/percona55-server/files/patch-extra_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-server/files/patch-include_CMakeLists.txt
===================================================================
--- trunk/databases/percona55-server/files/patch-include_CMakeLists.txt	                        (rev 0)
+++ trunk/databases/percona55-server/files/patch-include_CMakeLists.txt	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,10 @@
+--- 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 @@
+   ${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")
++ENDIF()


Property changes on: trunk/databases/percona55-server/files/patch-include_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-server/files/patch-include_my_compare.h
===================================================================
--- trunk/databases/percona55-server/files/patch-include_my_compare.h	                        (rev 0)
+++ trunk/databases/percona55-server/files/patch-include_my_compare.h	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,11 @@
+--- include/my_compare.h.orig	2011-05-10 09:46:46.000000000 +0200
++++ include/my_compare.h	2011-05-10 09:47:01.000000000 +0200
+@@ -39,7 +39,7 @@
+   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
+ */
+ 
+-#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
++#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
+ #define HA_MAX_KEY_SEG              16          /* Max segments for key */
+ 
+ #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)


Property changes on: trunk/databases/percona55-server/files/patch-include_my_compare.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-server/files/patch-include_myisam.h
===================================================================
--- trunk/databases/percona55-server/files/patch-include_myisam.h	                        (rev 0)
+++ trunk/databases/percona55-server/files/patch-include_myisam.h	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,11 @@
+--- include/myisam.h.orig	2009-02-16 23:04:54.000000000 +0100
++++ include/myisam.h	2009-02-16 23:10:08.000000000 +0100
+@@ -48,7 +48,7 @@
+   The following defines can be increased if necessary.
+   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
+ */
+-#define MI_MAX_KEY_LENGTH           1000            /* Max length in bytes */
++#define MI_MAX_KEY_LENGTH           4000            /* Max length in bytes */
+ #define MI_MAX_KEY_SEG              16              /* Max segments for key */
+ 
+ #define MI_MAX_KEY_BUFF  (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)


Property changes on: trunk/databases/percona55-server/files/patch-include_myisam.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-server/files/patch-libmysql_CMakeLists.txt
===================================================================
--- trunk/databases/percona55-server/files/patch-libmysql_CMakeLists.txt	                        (rev 0)
+++ trunk/databases/percona55-server/files/patch-libmysql_CMakeLists.txt	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,39 @@
+--- libmysql/CMakeLists.txt.orig	2014-06-30 17:54:26.000000000 +0200
++++ libmysql/CMakeLists.txt	2014-07-06 12:30:10.041356892 +0200
+@@ -165,7 +165,7 @@
+ 
+ # Merge several convenience libraries into one big perconaserverclient
+ # and link them together into shared library.
+-MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development)
++MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development NOINSTALL)
+ 
+ # Visual Studio users need debug  static library for debug projects
+ INSTALL_DEBUG_SYMBOLS(clientlib)
+@@ -180,6 +180,7 @@
+   SET(${out_name} ${name})
+ ENDMACRO()
+ 
++IF(FALSE)
+ IF(UNIX)
+   MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
+     SET(DOT_VERSION ".${VERSION}")
+@@ -200,11 +201,13 @@
+     ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a
+     ${INSTALL_LIBDIR} Development)
+ ENDIF()
++ENDIF()
+ 
+ IF(NOT DISABLE_SHARED)
+   MERGE_LIBRARIES(libmysql SHARED ${LIBS}
+     EXPORTS ${CLIENT_API_FUNCTIONS}
+-    COMPONENT SharedLibraries)
++    COMPONENT SharedLibraries NOINSTALL)
++  IF(FALSE)
+   IF(UNIX)
+     # libtool compatability
+     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
+@@ -264,3 +267,4 @@
+     ENDFOREACH()
+   ENDIF()
+ ENDIF()
++ENDIF()


Property changes on: trunk/databases/percona55-server/files/patch-libmysql_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-server/files/patch-libservices_CMakeLists.txt
===================================================================
--- trunk/databases/percona55-server/files/patch-libservices_CMakeLists.txt	                        (rev 0)
+++ trunk/databases/percona55-server/files/patch-libservices_CMakeLists.txt	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,9 @@
+--- libservices/CMakeLists.txt.orig	2010-12-23 17:13:03.000000000 +0100
++++ libservices/CMakeLists.txt	2010-12-23 17:13:17.000000000 +0100
+@@ -22,4 +22,6 @@
+   my_thread_scheduler_service.c)
+ 
+ ADD_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
++IF(FALSE)
+ INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
++ENDIF()


Property changes on: trunk/databases/percona55-server/files/patch-libservices_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-server/files/patch-man_CMakeLists.txt
===================================================================
--- trunk/databases/percona55-server/files/patch-man_CMakeLists.txt	                        (rev 0)
+++ trunk/databases/percona55-server/files/patch-man_CMakeLists.txt	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,11 @@
+--- man/CMakeLists.txt.orig	2011-10-22 14:36:06.000000000 +0200
++++ man/CMakeLists.txt	2011-10-22 14:36:23.000000000 +0200
+@@ -15,8 +15,6 @@
+ 
+ # Copy man pages
+ FILE(GLOB MAN1_FILES *.1)
+-FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
+-FILE(GLOB MAN1_NDB ndb*.1)
+ FILE(GLOB MAN8_FILES *.8)
+ FILE(GLOB MAN8_NDB ndb*.8)
+ IF(MAN1_FILES)


Property changes on: trunk/databases/percona55-server/files/patch-man_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-server/files/patch-mysys_default.c
===================================================================
--- trunk/databases/percona55-server/files/patch-mysys_default.c	                        (rev 0)
+++ trunk/databases/percona55-server/files/patch-mysys_default.c	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,31 @@
+--- 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 @@
+ 
+ /* Which directories are searched for options (and in which order) */
+ 
+-#define MAX_DEFAULT_DIRS 6
++#define MAX_DEFAULT_DIRS 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 @@
+ 
+ #if defined(DEFAULT_SYSCONFDIR)
+   if (DEFAULT_SYSCONFDIR[0])
++  {
+     errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
++    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
++  }
+ #endif /* DEFAULT_SYSCONFDIR */
+ 
+ #endif


Property changes on: trunk/databases/percona55-server/files/patch-mysys_default.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-server/files/patch-scripts_CMakeLists.txt
===================================================================
--- trunk/databases/percona55-server/files/patch-scripts_CMakeLists.txt	                        (rev 0)
+++ trunk/databases/percona55-server/files/patch-scripts_CMakeLists.txt	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,37 @@
+--- 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 @@
+           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
+           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
+           SET(${var} "${${var}}-l${lib} " ) 
++        ELSEIF(lib STREQUAL "-pthread")
++          SET(${var} "${${var}}-pthread " ) 
+         ELSE()
+           SET(${var} "${${var}}-l${lib} " ) 
+         ENDIF()
+@@ -316,16 +318,11 @@
+   # On Unix, most of the files end up in the bin directory
+   SET(mysql_config_COMPONENT COMPONENT Development)
+   SET(BIN_SCRIPTS
+-    msql2mysql
+-    mysql_config
+     mysql_fix_extensions
+     mysql_setpermission
+     mysql_secure_installation
+     mysql_zap
+-    mysqlaccess
+-    mysqlaccess.conf
+     mysql_convert_table_format
+-    mysql_find_rows
+     mysqlhotcopy
+     mysqldumpslow
+     mysqld_multi
+@@ -334,7 +331,7 @@
+   FOREACH(file ${BIN_SCRIPTS})
+     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
+       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
+-        ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
++        ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY)
+     ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file})
+       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}
+          ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY)


Property changes on: trunk/databases/percona55-server/files/patch-scripts_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-server/files/patch-scripts_mysqld_safe.sh
===================================================================
--- trunk/databases/percona55-server/files/patch-scripts_mysqld_safe.sh	                        (rev 0)
+++ trunk/databases/percona55-server/files/patch-scripts_mysqld_safe.sh	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,24 @@
+--- scripts/mysqld_safe.sh.orig	2007-10-08 10:39:23.000000000 +0200
++++ scripts/mysqld_safe.sh	2007-10-08 10:40:52.000000000 +0200
+@@ -242,10 +242,10 @@
+ 
+ if test -z "$MYSQL_HOME"
+ then 
+-  if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
++  if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf"
+   then
+     log_error "WARNING: Found two instances of my.cnf -
+-$MY_BASEDIR_VERSION/my.cnf and
++$MY_BASEDIR_VERSION/etc/my.cnf and
+ $DATADIR/my.cnf
+ IGNORING $DATADIR/my.cnf"
+ 
+@@ -254,7 +254,7 @@
+   then
+     log_error "WARNING: Found $DATADIR/my.cnf
+ The data directory is a deprecated location for my.cnf, please move it to
+-$MY_BASEDIR_VERSION/my.cnf"
++$MY_BASEDIR_VERSION/etc/my.cnf"
+     MYSQL_HOME=$DATADIR
+   else
+     MYSQL_HOME=$MY_BASEDIR_VERSION


Property changes on: trunk/databases/percona55-server/files/patch-scripts_mysqld_safe.sh
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-server/files/patch-sql_CMakeLists.txt
===================================================================
--- trunk/databases/percona55-server/files/patch-sql_CMakeLists.txt	                        (rev 0)
+++ trunk/databases/percona55-server/files/patch-sql_CMakeLists.txt	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,18 @@
+--- sql/CMakeLists.txt.orig     2013-05-24 03:51:34.000000000 +0200
++++ sql/CMakeLists.txt  2013-05-25 02:15:08.000000000 +0200
+@@ -268,6 +268,7 @@
+ 
+ IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
+ 
++IF(FALSE)
+ # Copy db.opt into data/test/
+ SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt ) 
+ INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles)
+@@ -308,6 +309,7 @@
+   INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
+ ENDIF()
+ ENDIF()
++ENDIF()
+ 
+ ADD_CUSTOM_TARGET(show-dist-name
+   COMMAND ${CMAKE_COMMAND} -E echo "${CPACK_PACKAGE_FILE_NAME}"


Property changes on: trunk/databases/percona55-server/files/patch-sql_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-server/files/patch-sql_sql_trigger.cc
===================================================================
--- trunk/databases/percona55-server/files/patch-sql_sql_trigger.cc	                        (rev 0)
+++ trunk/databases/percona55-server/files/patch-sql_sql_trigger.cc	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,50 @@
+--- sql/sql_trigger.cc.orig	2012-08-02 00:01:13.000000000 +0200
++++ sql/sql_trigger.cc	2012-09-11 17:01:13.000000000 +0200
+@@ -192,32 +192,32 @@ static File_option triggers_file_parameters[]=
+ {
+   {
+     { C_STRING_WITH_LEN("triggers") },
+-    my_offsetof(class Table_triggers_list, definitions_list),
++    static_cast<int>(my_offsetof(class Table_triggers_list, definitions_list)),
+     FILE_OPTIONS_STRLIST
+   },
+   {
+     { C_STRING_WITH_LEN("sql_modes") },
+-    my_offsetof(class Table_triggers_list, definition_modes_list),
++    static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
+     FILE_OPTIONS_ULLLIST
+   },
+   {
+     { C_STRING_WITH_LEN("definers") },
+-    my_offsetof(class Table_triggers_list, definers_list),
++    static_cast<int>(my_offsetof(class Table_triggers_list, definers_list)),
+     FILE_OPTIONS_STRLIST
+   },
+   {
+     { C_STRING_WITH_LEN("client_cs_names") },
+-    my_offsetof(class Table_triggers_list, client_cs_names),
++    static_cast<int>(my_offsetof(class Table_triggers_list, client_cs_names)),
+     FILE_OPTIONS_STRLIST
+   },
+   {
+     { C_STRING_WITH_LEN("connection_cl_names") },
+-    my_offsetof(class Table_triggers_list, connection_cl_names),
++    static_cast<int>(my_offsetof(class Table_triggers_list, connection_cl_names)),
+     FILE_OPTIONS_STRLIST
+   },
+   {
+     { C_STRING_WITH_LEN("db_cl_names") },
+-    my_offsetof(class Table_triggers_list, db_cl_names),
++    static_cast<int>(my_offsetof(class Table_triggers_list, db_cl_names)),
+     FILE_OPTIONS_STRLIST
+   },
+   { { 0, 0 }, 0, FILE_OPTIONS_STRING }
+@@ -226,7 +226,7 @@ static File_option triggers_file_parameters[]=
+ File_option sql_modes_parameters=
+ {
+   { C_STRING_WITH_LEN("sql_modes") },
+-  my_offsetof(class Table_triggers_list, definition_modes_list),
++  static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
+   FILE_OPTIONS_ULLLIST
+ };
+ 


Property changes on: trunk/databases/percona55-server/files/patch-sql_sql_trigger.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-server/files/patch-sql_sql_view.cc
===================================================================
--- trunk/databases/percona55-server/files/patch-sql_sql_view.cc	                        (rev 0)
+++ trunk/databases/percona55-server/files/patch-sql_sql_view.cc	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,63 @@
+--- sql/sql_view.cc.orig	2012-08-02 00:01:13.000000000 +0200
++++ sql/sql_view.cc	2012-09-11 17:01:13.000000000 +0200
+@@ -730,46 +730,46 @@ static const int required_view_parameters= 14;
+ */
+ static File_option view_parameters[]=
+ {{{ C_STRING_WITH_LEN("query")},
+-  my_offsetof(TABLE_LIST, select_stmt),
++  static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)),
+   FILE_OPTIONS_ESTRING},
+  {{ C_STRING_WITH_LEN("md5")},
+-  my_offsetof(TABLE_LIST, md5),
++  static_cast<int>(my_offsetof(TABLE_LIST, md5)),
+   FILE_OPTIONS_STRING},
+  {{ C_STRING_WITH_LEN("updatable")},
+-  my_offsetof(TABLE_LIST, updatable_view),
++  static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)),
+   FILE_OPTIONS_ULONGLONG},
+  {{ C_STRING_WITH_LEN("algorithm")},
+-  my_offsetof(TABLE_LIST, algorithm),
++  static_cast<int>(my_offsetof(TABLE_LIST, algorithm)),
+   FILE_OPTIONS_ULONGLONG},
+  {{ C_STRING_WITH_LEN("definer_user")},
+-  my_offsetof(TABLE_LIST, definer.user),
++  static_cast<int>(my_offsetof(TABLE_LIST, definer.user)),
+   FILE_OPTIONS_STRING},
+  {{ C_STRING_WITH_LEN("definer_host")},
+-  my_offsetof(TABLE_LIST, definer.host),
++  static_cast<int>(my_offsetof(TABLE_LIST, definer.host)),
+   FILE_OPTIONS_STRING},
+  {{ C_STRING_WITH_LEN("suid")},
+-  my_offsetof(TABLE_LIST, view_suid),
++  static_cast<int>(my_offsetof(TABLE_LIST, view_suid)),
+   FILE_OPTIONS_ULONGLONG},
+  {{ C_STRING_WITH_LEN("with_check_option")},
+-  my_offsetof(TABLE_LIST, with_check),
++  static_cast<int>(my_offsetof(TABLE_LIST, with_check)),
+   FILE_OPTIONS_ULONGLONG},
+  {{ C_STRING_WITH_LEN("timestamp")},
+-  my_offsetof(TABLE_LIST, timestamp),
++  static_cast<int>(my_offsetof(TABLE_LIST, timestamp)),
+   FILE_OPTIONS_TIMESTAMP},
+  {{ C_STRING_WITH_LEN("create-version")},
+-  my_offsetof(TABLE_LIST, file_version),
++  static_cast<int>(my_offsetof(TABLE_LIST, file_version)),
+   FILE_OPTIONS_ULONGLONG},
+  {{ C_STRING_WITH_LEN("source")},
+-  my_offsetof(TABLE_LIST, source),
++  static_cast<int>(my_offsetof(TABLE_LIST, source)),
+   FILE_OPTIONS_ESTRING},
+  {{(char*) STRING_WITH_LEN("client_cs_name")},
+-  my_offsetof(TABLE_LIST, view_client_cs_name),
++  static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)),
+   FILE_OPTIONS_STRING},
+  {{(char*) STRING_WITH_LEN("connection_cl_name")},
+-  my_offsetof(TABLE_LIST, view_connection_cl_name),
++  static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)),
+   FILE_OPTIONS_STRING},
+  {{(char*) STRING_WITH_LEN("view_body_utf8")},
+-  my_offsetof(TABLE_LIST, view_body_utf8),
++  static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)),
+   FILE_OPTIONS_ESTRING},
+  {{NullS, 0},			0,
+   FILE_OPTIONS_STRING}


Property changes on: trunk/databases/percona55-server/files/patch-sql_sql_view.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-server/files/patch-sql_sys_vars.cc
===================================================================
--- trunk/databases/percona55-server/files/patch-sql_sys_vars.cc	                        (rev 0)
+++ trunk/databases/percona55-server/files/patch-sql_sys_vars.cc	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,38 @@
+--- sql/sys_vars.cc.orig	2012-06-15 17:03:32.000000000 +0200
++++ sql/sys_vars.cc	2012-06-15 17:16:23.000000000 +0200
+@@ -900,7 +900,7 @@
+        "connection before closing it",
+        SESSION_VAR(net_interactive_timeout),
+        CMD_LINE(REQUIRED_ARG),
+-       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
++       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
+ 
+ static Sys_var_ulong Sys_join_buffer_size(
+        "join_buffer_size",
+@@ -1401,7 +1401,7 @@
+        "Number of seconds to wait for more data from a connection before "
+        "aborting the read",
+        SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
+-       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
++       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
+        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
+        ON_UPDATE(fix_net_read_timeout));
+ 
+@@ -1416,7 +1416,7 @@
+        "Number of seconds to wait for a block to be written to a connection "
+        "before aborting the write",
+        SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
+-       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
++       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
+        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
+        ON_UPDATE(fix_net_write_timeout));
+ 
+@@ -2257,7 +2257,7 @@
+        "The number of seconds the server waits for activity on a "
+        "connection before closing it",
+        SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
+-       VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
++       VALID_RANGE(1, INT_MAX32/1000),
+        DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
+ 
+ /** propagates changes to the relevant flag of @@optimizer_switch */


Property changes on: trunk/databases/percona55-server/files/patch-sql_sys_vars.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-server/files/patch-storage__innobase__handler__i_s.cc
===================================================================
--- trunk/databases/percona55-server/files/patch-storage__innobase__handler__i_s.cc	                        (rev 0)
+++ trunk/databases/percona55-server/files/patch-storage__innobase__handler__i_s.cc	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,24 @@
+--- storage/innobase/handler/i_s.cc.orig	2013-12-02 01:43:24.000000000 -0500
++++ storage/innobase/handler/i_s.cc	2014-01-19 12:21:24.113243651 -0500
+@@ -49,17 +49,21 @@
+ #include "buf0buddy.h"
+ #include "buf0buf.h"
+ #include "buf0lru.h"
++#include "dict0load.h"
++#include "buf0lru.h"
+ #include "ibuf0ibuf.h"
+ #include "dict0mem.h"
+ #include "dict0types.h"
+ #include "dict0boot.h"
+ #include "dict0load.h"
+ #include "ha_prototypes.h"
++#include "srv0srv.h"
+ #include "srv0start.h"
+ #include "srv0srv.h"
+ #include "trx0i_s.h"
+ #include "trx0rseg.h"
+ #include "trx0trx.h"
++#include "trx0trx.h"
+ #include "trx0undo.h"
+ #include "log0online.h"
+ #include "btr0btr.h"


Property changes on: trunk/databases/percona55-server/files/patch-storage__innobase__handler__i_s.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-server/files/patch-support-files_CMakeLists.txt
===================================================================
--- trunk/databases/percona55-server/files/patch-support-files_CMakeLists.txt	                        (rev 0)
+++ trunk/databases/percona55-server/files/patch-support-files_CMakeLists.txt	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,12 @@
+--- support-files/CMakeLists.txt.orig	2010-12-23 17:38:19.000000000 +0100
++++ support-files/CMakeLists.txt	2010-12-23 17:41:11.000000000 +0100
+@@ -74,7 +74,9 @@
+     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
+   ENDIF()
+ 
++IF(FALSE)
+   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
++ENDIF()
+   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)


Property changes on: trunk/databases/percona55-server/files/patch-support-files_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-server/pkg-descr
===================================================================
--- trunk/databases/percona55-server/pkg-descr	                        (rev 0)
+++ trunk/databases/percona55-server/pkg-descr	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,4 @@
+MySQL replacement : Percona ServerPercona Server is a drop-in alternative
+for MySQL with enhanced performance and enterprise-grade features.
+
+WWW: http://www.percona.com/software/percona-server


Property changes on: trunk/databases/percona55-server/pkg-descr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-server/pkg-message
===================================================================
--- trunk/databases/percona55-server/pkg-message	                        (rev 0)
+++ trunk/databases/percona55-server/pkg-message	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,7 @@
+************************************************************************
+
+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.
+
+************************************************************************


Property changes on: trunk/databases/percona55-server/pkg-message
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/percona55-server/pkg-plist
===================================================================
--- trunk/databases/percona55-server/pkg-plist	                        (rev 0)
+++ trunk/databases/percona55-server/pkg-plist	2018-04-29 21:14:21 UTC (rev 23242)
@@ -0,0 +1,142 @@
+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/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/libfnv1a_udf.so
+lib/mysql/plugin/libfnv_udf.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/semisync_master.so
+lib/mysql/plugin/semisync_slave.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%%/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%%/config.huge.ini
+%%DATADIR%%/config.medium.ini
+%%DATADIR%%/config.small.ini
+%%DATADIR%%/czech/errmsg.sys
+%%DATADIR%%/danish/errmsg.sys
+%%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%%/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%%/mysql-log-rotate
+%%DATADIR%%/mysql.server
+%%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
+%%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%%/ukrainian/errmsg.sys
+ at dir(mysql,mysql,) /var/db/mysql


Property changes on: trunk/databases/percona55-server/pkg-plist
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property


More information about the Midnightbsd-cvs mailing list