From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Apr 1 20:20:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6C755771 for ; Tue, 1 Apr 2014 20:20:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4726479B for ; Tue, 1 Apr 2014 20:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s31KK0Di010293 for ; Tue, 1 Apr 2014 20:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s31KK0gD010292; Tue, 1 Apr 2014 20:20:00 GMT (envelope-from gnats) Resent-Date: Tue, 1 Apr 2014 20:20:00 GMT Resent-Message-Id: <201404012020.s31KK0gD010292@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Horia Racoviceanu Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E208D2A6 for ; Tue, 1 Apr 2014 20:12:37 +0000 (UTC) Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C2C0269C for ; Tue, 1 Apr 2014 20:12:37 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s31KCbrg035558 for ; Tue, 1 Apr 2014 20:12:37 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s31KCbcL035555; Tue, 1 Apr 2014 20:12:37 GMT (envelope-from nobody) Message-Id: <201404012012.s31KCbcL035555@cgiserv.freebsd.org> Date: Tue, 1 Apr 2014 20:12:37 GMT From: Horia Racoviceanu To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/188180: [New port] databases/mysql56-galera-client: Multithreaded SQL database with wsrep patch (client) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Apr 2014 20:20:00 -0000 >Number: 188180 >Category: ports >Synopsis: [New port] databases/mysql56-galera-client: Multithreaded SQL database with wsrep patch (client) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Apr 01 20:20:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Horia Racoviceanu >Release: 10.0-RELEASE amd64 >Organization: >Environment: FreeBSD heta 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64 >Description: MySQL Cluster is a wsrep-patched MySQL distribution by Codership. Wsrep API developed by Codership Oy is a modern generic (database-agnostic) replication API for transactional databases with a goal to make database replication/logging subsystem completely modular and pluggable. It is developed with flexibility and completeness in mind to satisfy broad range of modern replication scenarios. It is equally suitable for synchronous and asynchronous, master-slave and multi-master replication. wsrep stands for Write Set REPlication. Wsrep patch for MySQL/InnoDB allows MySQL server to load and use various wsrep API implementations ("wsrep providers") with different qualities of service. Without wsrep provider MySQL-wsrep server will function like a regular standalone server. Source code can be found at wsrep API: https://launchpad.net/wsrep MySQL patch: https://launchpad.net/codership-mysql Compatible with databases/galera WWW: http://galeracluster.com/downloads/ >How-To-Repeat: >Fix: Build log: https://redports.org/buildarchive/20140401042510-98462/ Patch attached with submission follows: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # mysql56-galera-client # mysql56-galera-client/files # mysql56-galera-client/files/patch-support-files__CMakeLists.txt # mysql56-galera-client/files/patch-scripts__CMakeLists.txt # mysql56-galera-client/files/patch-mysys_ssl__my_default.cc # mysql56-galera-client/files/patch-man_CMakeLists.txt # mysql56-galera-client/files/patch-include_myisam.h # mysql56-galera-client/files/patch-include_my_compare.h # mysql56-galera-client/files/patch-include-CMakeLists.txt # mysql56-galera-client/files/patch-extra_yassl_taocrypt_src_integer.cpp # mysql56-galera-client/files/patch-extra_yassl_taocrypt_include_misc.hpp # mysql56-galera-client/files/patch-extra_CMakeLists.txt # mysql56-galera-client/files/patch-cmake_readline.cmake # mysql56-galera-client/files/patch-client_CMakeLists.txt # mysql56-galera-client/files/patch-CMakeLists.txt # mysql56-galera-client/pkg-plist # mysql56-galera-client/Makefile # echo c - mysql56-galera-client mkdir -p mysql56-galera-client > /dev/null 2>&1 echo c - mysql56-galera-client/files mkdir -p mysql56-galera-client/files > /dev/null 2>&1 echo x - mysql56-galera-client/files/patch-support-files__CMakeLists.txt sed 's/^X//' >mysql56-galera-client/files/patch-support-files__CMakeLists.txt << 'b720dfb6a134ce4954dd47f6f4be0ea0' X--- ./support-files/CMakeLists.txt.orig 2014-03-28 17:46:49.000000000 -0400 X+++ ./support-files/CMakeLists.txt 2014-03-28 17:48:13.000000000 -0400 X@@ -44,14 +44,17 @@ X SET(inst_location ${INSTALL_SUPPORTFILESDIR}) X ENDIF() X X+IF(FALSE) X SET(inifile my-default) X CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh X ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY) X INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} X DESTINATION ${inst_location} COMPONENT IniFiles) X+ENDIF() X X IF(UNIX) X SET(prefix ${CMAKE_INSTALL_PREFIX}) X+IF(FALSE) X FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure) X CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh X ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) X@@ -68,8 +71,10 @@ X IF(INSTALL_SUPPORTFILESDIR) X INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) X ENDIF() X+ENDIF() X X INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) X+IF(FALSE) X CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY) X CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY) X X@@ -102,3 +107,4 @@ X CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/wsrep.cnf.sh X ${CMAKE_CURRENT_BINARY_DIR}/wsrep.cnf @ONLY) X ENDIF() X+ENDIF() b720dfb6a134ce4954dd47f6f4be0ea0 echo x - mysql56-galera-client/files/patch-scripts__CMakeLists.txt sed 's/^X//' >mysql56-galera-client/files/patch-scripts__CMakeLists.txt << 'b96991fa6b4804cba2786584a6bc59f2' X--- ./scripts/CMakeLists.txt.orig 2014-03-28 17:48:24.000000000 -0400 X+++ ./scripts/CMakeLists.txt 2014-03-28 17:53:49.000000000 -0400 X@@ -71,6 +71,7 @@ X ) X ENDIF() X X+IF(FALSE) X INSTALL(FILES X ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql X ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql X@@ -80,6 +81,7 @@ X ${FIX_PRIVILEGES_SQL} X DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server X ) X+ENDIF() X X # TCMalloc hacks X IF(MALLOC_LIB) X@@ -152,6 +154,7 @@ X SET(HOSTNAME "hostname") X SET(MYSQLD_USER "mysql") X X+IF(FALSE) X # Required for mysqlbug until autotools are deprecated, once done remove these X # and expand default cmake variables X SET(CC ${CMAKE_C_COMPILER}) X@@ -188,6 +191,7 @@ X DESTINATION ${INSTALL_BINDIR} X COMPONENT Server X ) X+ENDIF() X X ENDIF(UNIX) X X@@ -212,6 +216,7 @@ X SET(localstatedir ${MYSQL_DATADIR}) X ENDIF() X X+IF(FALSE) X IF(UNIX) X SET(EXT) X ELSE() X@@ -226,6 +231,7 @@ X DESTINATION ${DEST} X COMPONENT Server X ) X+ENDIF() X X SET(prefix "${CMAKE_INSTALL_PREFIX}") X SET(sysconfdir ${prefix}) X@@ -276,6 +282,8 @@ X GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) X STRING(REGEX REPLACE "^lib" "" lib "${lib}") X SET(${var} "${${var}}-l${lib} " ) X+ ELSEIF(lib STREQUAL "-pthread") X+ SET(${var} "${${var}}-pthread " ) X ELSE() X SET(${var} "${${var}}-l${lib} " ) X ENDIF() X@@ -337,18 +345,9 @@ X SET(BIN_SCRIPTS X msql2mysql X mysql_config X- mysql_fix_extensions X- mysql_setpermission X- mysql_zap X mysqlaccess X mysqlaccess.conf X- mysql_convert_table_format X mysql_find_rows X- mysqlhotcopy X- mysqldumpslow X- mysqld_multi X- mysqld_safe X- ${WSREP_BINARIES} X ) X FOREACH(file ${BIN_SCRIPTS}) X IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) X@@ -372,6 +371,7 @@ X ) X ENDFOREACH() X X+IF(FALSE) X # Input files with pl.in extension - drop the extension completely X SET(PLIN_FILES mysql_secure_installation) X FOREACH(file ${PLIN_FILES}) X@@ -384,6 +384,7 @@ X INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/${file} COMPONENT ${${file}_COMPONENT}) X ENDFOREACH() X ENDIF() X+ENDIF() X X # Install libgcc as mylibgcc.a X IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_FLAGS MATCHES "-static") b96991fa6b4804cba2786584a6bc59f2 echo x - mysql56-galera-client/files/patch-mysys_ssl__my_default.cc sed 's/^X//' >mysql56-galera-client/files/patch-mysys_ssl__my_default.cc << '712da1c3a1bcf34c924bc642ab661f28' X--- ./mysys_ssl/my_default.cc.orig 2014-03-27 15:32:15.000000000 -0400 X+++ ./mysys_ssl/my_default.cc 2014-03-27 15:35:52.000000000 -0400 X@@ -124,7 +124,7 @@ X X /* Which directories are searched for options (and in which order) */ X X-#define MAX_DEFAULT_DIRS 6 X+#define MAX_DEFAULT_DIRS 7 X #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ X static const char **default_directories = NULL; X X@@ -1405,7 +1405,10 @@ X X #if defined(DEFAULT_SYSCONFDIR) X if (DEFAULT_SYSCONFDIR[0]) X+ { X errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); X+ errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs); X+ } X #endif /* DEFAULT_SYSCONFDIR */ X X #endif X@@ -1476,7 +1479,7 @@ X MY_STAT stat_info; X X if (!my_stat(file_name,&stat_info,MYF(0))) X- return 1; X+ return 0; X /* X Ignore .mylogin.cnf file if not exclusively readable/writable X by current user. 712da1c3a1bcf34c924bc642ab661f28 echo x - mysql56-galera-client/files/patch-man_CMakeLists.txt sed 's/^X//' >mysql56-galera-client/files/patch-man_CMakeLists.txt << '982061c8b805a0d4e13826c6023f1d5e' X--- man/CMakeLists.txt.orig 2011-10-22 14:08:32.000000000 +0200 X+++ man/CMakeLists.txt 2011-10-22 14:22:42.000000000 +0200 X@@ -15,10 +15,6 @@ X X # Copy man pages X FILE(GLOB MAN1_FILES *.1) X-FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1) X-FILE(GLOB MAN1_NDB ndb*.1) X-FILE(GLOB MAN8_FILES *.8) X-FILE(GLOB MAN8_NDB ndb*.8) X IF(MAN1_FILES) X IF(MAN1_EXCLUDE) X LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE}) 982061c8b805a0d4e13826c6023f1d5e echo x - mysql56-galera-client/files/patch-include_myisam.h sed 's/^X//' >mysql56-galera-client/files/patch-include_myisam.h << '8c5e667cd8c546ef9aa6d6ffa18ed33a' X--- include/myisam.h.orig 2009-02-16 23:04:54.000000000 +0100 X+++ include/myisam.h 2009-02-16 23:10:08.000000000 +0100 X@@ -48,7 +48,7 @@ X The following defines can be increased if necessary. X But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH. X */ X-#define MI_MAX_KEY_LENGTH 1000 /* Max length in bytes */ X+#define MI_MAX_KEY_LENGTH 4000 /* Max length in bytes */ X #define MI_MAX_KEY_SEG 16 /* Max segments for key */ X X #define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8) 8c5e667cd8c546ef9aa6d6ffa18ed33a echo x - mysql56-galera-client/files/patch-include_my_compare.h sed 's/^X//' >mysql56-galera-client/files/patch-include_my_compare.h << '8a88a3e22d5776de7cda4ccf2694684b' X--- include/my_compare.h.orig 2011-05-10 09:46:46.000000000 +0200 X+++ include/my_compare.h 2011-05-10 09:47:01.000000000 +0200 X@@ -39,7 +39,7 @@ X But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. X */ X X-#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */ X+#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */ X #define HA_MAX_KEY_SEG 16 /* Max segments for key */ X X #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) 8a88a3e22d5776de7cda4ccf2694684b echo x - mysql56-galera-client/files/patch-include-CMakeLists.txt sed 's/^X//' >mysql56-galera-client/files/patch-include-CMakeLists.txt << '16156ad658583f46a1f525d3758b35e7' X--- include/CMakeLists.txt.orig 2014-01-14 23:38:00.000000000 +0800 X+++ include/CMakeLists.txt 2014-02-28 04:51:50.269412818 +0800 X@@ -35,6 +35,7 @@ X X SET(HEADERS X ${HEADERS_ABI} X+ hash.h X my_dbug.h X m_string.h X my_sys.h 16156ad658583f46a1f525d3758b35e7 echo x - mysql56-galera-client/files/patch-extra_yassl_taocrypt_src_integer.cpp sed 's/^X//' >mysql56-galera-client/files/patch-extra_yassl_taocrypt_src_integer.cpp << 'e2392a8ef283dc53e184394c070b3a1a' X--- extra/yassl/taocrypt/src/integer.cpp.orig 2012-04-02 09:37:09.000000000 +0200 X+++ extra/yassl/taocrypt/src/integer.cpp 2012-04-02 09:37:41.000000000 +0200 X@@ -73,7 +73,7 @@ X CPP_TYPENAME AlignedAllocator::pointer AlignedAllocator::allocate( X size_type n, const void *) X { X- if (n > max_size()) X+ if (n > AlignedAllocator::max_size()) X return 0; X if (n == 0) X return 0; e2392a8ef283dc53e184394c070b3a1a echo x - mysql56-galera-client/files/patch-extra_yassl_taocrypt_include_misc.hpp sed 's/^X//' >mysql56-galera-client/files/patch-extra_yassl_taocrypt_include_misc.hpp << '218c23b68d48ac379e986de1364f3fb1' X--- extra/yassl/taocrypt/include/misc.hpp.orig X+++ extra/yassl/taocrypt/include/misc.hpp X@@ -124,7 +124,7 @@ X X X // no gas on these systems ?, disable for now X-#if defined(__sun__) || defined (__APPLE__) X+#if defined(__sun__) || defined (__APPLE__) || defined(__clang__) X #define TAOCRYPT_DISABLE_X86ASM X #endif X 218c23b68d48ac379e986de1364f3fb1 echo x - mysql56-galera-client/files/patch-extra_CMakeLists.txt sed 's/^X//' >mysql56-galera-client/files/patch-extra_CMakeLists.txt << '326ca897b1c5753331a56b0f147e0f9f' X--- extra/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 X+++ extra/CMakeLists.txt 2013-02-13 11:02:40.000000000 +0100 X@@ -60,6 +60,7 @@ X ENDIF() X X X+IF(FALSE) X MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) X TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) X SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX) X@@ -96,11 +97,14 @@ X MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES}) X TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl) X ENDIF() X+ENDIF() X X IF(UNIX) X+IF(FALSE) X MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) X TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl) X SET_TARGET_PROPERTIES(resolve_stack_dump PROPERTIES LINKER_LANGUAGE CXX) X+ENDIF() X X MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c) X TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl) 326ca897b1c5753331a56b0f147e0f9f echo x - mysql56-galera-client/files/patch-cmake_readline.cmake sed 's/^X//' >mysql56-galera-client/files/patch-cmake_readline.cmake << 'fa08385541fb6b1818e366d338324358' X--- cmake/readline.cmake.orig 2013-06-30 10:45:55.000000000 +0200 X+++ cmake/readline.cmake 2013-06-30 10:47:08.000000000 +0200 X@@ -147,7 +147,7 @@ X X FIND_LIBRARY(EDITLINE_LIBRARY X NAMES X- edit X+ readline X ) X MARK_AS_ADVANCED(EDITLINE_INCLUDE_DIR EDITLINE_LIBRARY) X fa08385541fb6b1818e366d338324358 echo x - mysql56-galera-client/files/patch-client_CMakeLists.txt sed 's/^X//' >mysql56-galera-client/files/patch-client_CMakeLists.txt << '089523f95528a7286d745f111e75a5bf' X--- client/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 X+++ client/CMakeLists.txt 2013-02-13 10:36:50.000000000 +0100 X@@ -39,9 +39,11 @@ X TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY}) X ENDIF(UNIX) X X+IF(FALSE) X MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) X SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") X TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) X+ENDIF() X X X MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) X@@ -53,15 +55,19 @@ X MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) X TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) X X+IF(FALSE) X MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) X TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) X ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) X+ENDIF() X X MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) X TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) X X+IF(FALSE) X MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) X TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) X+ENDIF() X X MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) X TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) X@@ -82,8 +88,6 @@ X ENDIF(WIN32) X X SET_TARGET_PROPERTIES ( X- mysql_plugin X- mysql_upgrade X mysqlcheck X mysqldump X mysqlimport 089523f95528a7286d745f111e75a5bf echo x - mysql56-galera-client/files/patch-CMakeLists.txt sed 's/^X//' >mysql56-galera-client/files/patch-CMakeLists.txt << 'd26ab8482349505a6c78d96567a999dd' X--- ./CMakeLists.txt.orig 2014-03-27 15:20:45.000000000 -0400 X+++ ./CMakeLists.txt 2014-03-27 15:26:48.000000000 -0400 X@@ -476,33 +476,11 @@ X ENDIF() X X ADD_SUBDIRECTORY(extra) X-IF(NOT WITHOUT_SERVER) X- ADD_SUBDIRECTORY(tests) X- ADD_SUBDIRECTORY(client) X- ADD_SUBDIRECTORY(sql) X- ADD_SUBDIRECTORY(sql/share) X- ADD_SUBDIRECTORY(libservices) X- OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) X- IF(WITH_EMBEDDED_SERVER) X- ADD_SUBDIRECTORY(libmysqld) X- ADD_SUBDIRECTORY(libmysqld/examples) X- ENDIF(WITH_EMBEDDED_SERVER) X- X- ADD_SUBDIRECTORY(mysql-test) X- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) X- ADD_SUBDIRECTORY(support-files) X- ADD_SUBDIRECTORY(scripts) X- ADD_SUBDIRECTORY(sql-bench) X- IF(UNIX) X- ADD_SUBDIRECTORY(man) X- ENDIF() X- IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) X- ADD_SUBDIRECTORY(internal) X- ENDIF() X- ADD_SUBDIRECTORY(packaging/rpm-uln) X- ADD_SUBDIRECTORY(packaging/rpm-oel) X- ADD_SUBDIRECTORY(packaging/rpm-fedora) X-ENDIF() X+ADD_SUBDIRECTORY(client) X+ADD_SUBDIRECTORY(libservices) X+ADD_SUBDIRECTORY(support-files) X+ADD_SUBDIRECTORY(scripts) X+ADD_SUBDIRECTORY(man) X X INCLUDE(cmake/abi_check.cmake) X INCLUDE(cmake/tags.cmake) X@@ -539,18 +517,17 @@ X SET(CPACK_GENERATOR "TGZ") X ENDIF() X ADD_SUBDIRECTORY(packaging/WiX) X-ADD_SUBDIRECTORY(packaging/solaris) X X # Create a single package with "make package" X # (see http://public.kitware.com/Bug/view.php?id=11452) X SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "") X X IF(UNIX) X- INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) X ENDIF() X # X # RPM installs documentation directly from the source tree X # X+IF(FALSE) X IF(NOT INSTALL_LAYOUT MATCHES "RPM") X INSTALL(FILES COPYING LICENSE.mysql X DESTINATION ${INSTALL_DOCREADMEDIR} X@@ -577,5 +554,6 @@ X PATTERN "sp-imp-spec.txt" EXCLUDE X ) X ENDIF() X+ENDIF() X X INCLUDE(CPack) d26ab8482349505a6c78d96567a999dd echo x - mysql56-galera-client/pkg-plist sed 's/^X//' >mysql56-galera-client/pkg-plist << 'eb5c3438e4006845250c8a148899e739' Xbin/msql2mysql Xbin/mysql Xbin/mysql_config Xbin/mysql_config_editor Xbin/mysql_find_rows Xbin/mysql_waitpid Xbin/mysqlaccess Xbin/mysqlaccess.conf Xbin/mysqladmin Xbin/mysqlbinlog Xbin/mysqlcheck Xbin/mysqldump Xbin/mysqlimport Xbin/mysqlshow Xbin/mysqlslap Xinclude/mysql/big_endian.h Xinclude/mysql/byte_order_generic.h Xinclude/mysql/byte_order_generic_x86.h Xinclude/mysql/byte_order_generic_x86_64.h Xinclude/mysql/decimal.h Xinclude/mysql/errmsg.h Xinclude/mysql/hash.h Xinclude/mysql/keycache.h Xinclude/mysql/little_endian.h Xinclude/mysql/m_ctype.h Xinclude/mysql/m_string.h Xinclude/mysql/my_alloc.h Xinclude/mysql/my_attribute.h Xinclude/mysql/my_byteorder.h Xinclude/mysql/my_compiler.h Xinclude/mysql/my_config.h Xinclude/mysql/my_dbug.h Xinclude/mysql/my_dir.h Xinclude/mysql/my_getopt.h Xinclude/mysql/my_global.h Xinclude/mysql/my_list.h Xinclude/mysql/my_net.h Xinclude/mysql/my_pthread.h Xinclude/mysql/my_sys.h Xinclude/mysql/my_xml.h Xinclude/mysql/mysql.h Xinclude/mysql/mysql/client_authentication.h Xinclude/mysql/mysql/client_plugin.h Xinclude/mysql/mysql/client_plugin.h.pp Xinclude/mysql/mysql/get_password.h Xinclude/mysql/mysql/innodb_priv.h Xinclude/mysql/mysql/plugin.h Xinclude/mysql/mysql/plugin_audit.h Xinclude/mysql/mysql/plugin_audit.h.pp Xinclude/mysql/mysql/plugin_auth.h Xinclude/mysql/mysql/plugin_auth.h.pp Xinclude/mysql/mysql/plugin_auth_common.h Xinclude/mysql/mysql/plugin_ftparser.h Xinclude/mysql/mysql/plugin_ftparser.h.pp Xinclude/mysql/mysql/plugin_validate_password.h Xinclude/mysql/mysql/psi/mysql_file.h Xinclude/mysql/mysql/psi/mysql_idle.h Xinclude/mysql/mysql/psi/mysql_socket.h Xinclude/mysql/mysql/psi/mysql_stage.h Xinclude/mysql/mysql/psi/mysql_statement.h Xinclude/mysql/mysql/psi/mysql_table.h Xinclude/mysql/mysql/psi/mysql_thread.h Xinclude/mysql/mysql/psi/psi.h Xinclude/mysql/mysql/service_my_plugin_log.h Xinclude/mysql/mysql/service_my_snprintf.h Xinclude/mysql/mysql/service_mysql_string.h Xinclude/mysql/mysql/service_thd_alloc.h Xinclude/mysql/mysql/service_thd_wait.h Xinclude/mysql/mysql/service_thread_scheduler.h Xinclude/mysql/mysql/services.h Xinclude/mysql/mysql/thread_pool_priv.h Xinclude/mysql/mysql_com.h Xinclude/mysql/mysql_com_server.h Xinclude/mysql/mysql_embed.h Xinclude/mysql/mysql_time.h Xinclude/mysql/mysql_version.h Xinclude/mysql/mysqld_ername.h Xinclude/mysql/mysqld_error.h Xinclude/mysql/plugin.h Xinclude/mysql/plugin_audit.h Xinclude/mysql/plugin_ftparser.h Xinclude/mysql/plugin_validate_password.h Xinclude/mysql/sql_common.h Xinclude/mysql/sql_state.h Xinclude/mysql/sslopt-case.h Xinclude/mysql/sslopt-longopts.h Xinclude/mysql/sslopt-vars.h Xinclude/mysql/typelib.h Xlib/mysql/libmysqlclient.a Xlib/mysql/libmysqlclient.so Xlib/mysql/libmysqlclient.so.18 Xlib/mysql/libmysqlclient_r.a Xlib/mysql/libmysqlclient_r.so Xlib/mysql/libmysqlclient_r.so.18 Xlib/mysql/libmysqlservices.a Xman/man1/comp_err.1.gz Xman/man1/innochecksum.1.gz Xman/man1/msql2mysql.1.gz Xman/man1/my_print_defaults.1.gz Xman/man1/myisam_ftdump.1.gz Xman/man1/myisamchk.1.gz Xman/man1/myisamlog.1.gz Xman/man1/myisampack.1.gz Xman/man1/mysql-stress-test.pl.1.gz Xman/man1/mysql-test-run.pl.1.gz Xman/man1/mysql.1.gz Xman/man1/mysql.server.1.gz Xman/man1/mysql_client_test.1.gz Xman/man1/mysql_client_test_embedded.1.gz Xman/man1/mysql_config.1.gz Xman/man1/mysql_config_editor.1.gz Xman/man1/mysql_convert_table_format.1.gz Xman/man1/mysql_find_rows.1.gz Xman/man1/mysql_fix_extensions.1.gz Xman/man1/mysql_install_db.1.gz Xman/man1/mysql_plugin.1.gz Xman/man1/mysql_secure_installation.1.gz Xman/man1/mysql_setpermission.1.gz Xman/man1/mysql_tzinfo_to_sql.1.gz Xman/man1/mysql_upgrade.1.gz Xman/man1/mysql_waitpid.1.gz Xman/man1/mysql_zap.1.gz Xman/man1/mysqlaccess.1.gz Xman/man1/mysqladmin.1.gz Xman/man1/mysqlbinlog.1.gz Xman/man1/mysqlbug.1.gz Xman/man1/mysqlcheck.1.gz Xman/man1/mysqld_multi.1.gz Xman/man1/mysqld_safe.1.gz Xman/man1/mysqldump.1.gz Xman/man1/mysqldumpslow.1.gz Xman/man1/mysqlhotcopy.1.gz Xman/man1/mysqlimport.1.gz Xman/man1/mysqlman.1.gz Xman/man1/mysqlshow.1.gz Xman/man1/mysqlslap.1.gz Xman/man1/mysqltest.1.gz Xman/man1/mysqltest_embedded.1.gz Xman/man1/ndb-common-options.1.gz Xman/man1/ndb_blob_tool.1.gz Xman/man1/ndb_config.1.gz Xman/man1/ndb_cpcd.1.gz Xman/man1/ndb_delete_all.1.gz Xman/man1/ndb_desc.1.gz Xman/man1/ndb_drop_index.1.gz Xman/man1/ndb_drop_table.1.gz Xman/man1/ndb_error_reporter.1.gz Xman/man1/ndb_index_stat.1.gz Xman/man1/ndb_mgm.1.gz Xman/man1/ndb_print_backup_file.1.gz Xman/man1/ndb_print_schema_file.1.gz Xman/man1/ndb_print_sys_file.1.gz Xman/man1/ndb_restore.1.gz Xman/man1/ndb_select_all.1.gz Xman/man1/ndb_select_count.1.gz Xman/man1/ndb_setup.py.1.gz Xman/man1/ndb_show_tables.1.gz Xman/man1/ndb_size.pl.1.gz Xman/man1/ndb_waiter.1.gz Xman/man1/ndbd_redo_log_reader.1.gz Xman/man1/ndbinfo_select_all.1.gz Xman/man1/perror.1.gz Xman/man1/replace.1.gz Xman/man1/resolve_stack_dump.1.gz Xman/man1/resolveip.1.gz Xshare/aclocal/mysql.m4 X@dirrmtry lib/mysql X@dirrm include/mysql/mysql/psi X@dirrm include/mysql/mysql X@dirrm include/mysql eb5c3438e4006845250c8a148899e739 echo x - mysql56-galera-client/Makefile sed 's/^X//' >mysql56-galera-client/Makefile << '01bb159925425415c4e8811959dab3b1' X# Created by: Horia Racoviceanu X# $FreeBSD$ X XPORTNAME= mysql XPKGNAMESUFFIX= 56-galera-client X XCOMMENT= Multithreaded SQL database with wsrep patch (client) X XMASTERDIR= ${.CURDIR}/../mysql56-galera-server X XPKGMESSAGE= mustnotexist XPATCHDIR= ${.CURDIR}/files XPLIST= ${.CURDIR}/pkg-plist X XCONFLICTS_INSTALL= mysql5.[0-46-9]-client-* \ X mysql[0-46-9][0-9]-client-* \ X mysql[0-55-9][0-9]-client-* \ X mysql[0-55-9][0-9]-galera-client-* \ X mysql[0-56-9][0-9]-client-* \ X mariadb[0-9][0-9]-client-* \ X mariadb[0-9][0-9]-galera-client-* \ X percona[0-9][0-9]-client-* X XCMAKE_ARGS+= -DWITHOUT_SERVER=1 X XUSE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} X XCLIENT_ONLY= yes X X.include "${MASTERDIR}/Makefile" 01bb159925425415c4e8811959dab3b1 exit >Release-Note: >Audit-Trail: >Unformatted: