From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Apr 1 20:10:01 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7CDFDF0 for ; Tue, 1 Apr 2014 20:10:01 +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 5804D5FA for ; Tue, 1 Apr 2014 20:10:01 +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 s31KA1KE006402 for ; Tue, 1 Apr 2014 20:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s31KA1cL006401; Tue, 1 Apr 2014 20:10:01 GMT (envelope-from gnats) Resent-Date: Tue, 1 Apr 2014 20:10:01 GMT Resent-Message-Id: <201404012010.s31KA1cL006401@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 [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F180BE8C for ; Tue, 1 Apr 2014 20:04:40 +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 D20DF3F9 for ; Tue, 1 Apr 2014 20:04:40 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s31K4eK4010275 for ; Tue, 1 Apr 2014 20:04:40 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s31K4e8k010273; Tue, 1 Apr 2014 20:04:40 GMT (envelope-from nobody) Message-Id: <201404012004.s31K4e8k010273@cgiserv.freebsd.org> Date: Tue, 1 Apr 2014 20:04:40 GMT From: Horia Racoviceanu To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/188178: [New port] databases/mariadb55-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:10:01 -0000 >Number: 188178 >Category: ports >Synopsis: [New port] databases/mariadb55-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:10:01 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: MariaDB Galera Cluster is a synchronous multi-master cluster for MariaDB. Features: - Synchronous replication - Active-active multi-master topology - Read and write to any cluster node - Automatic membership control, failed nodes drop from the cluster - Automatic node joining - True parallel replication, on row level - Direct client connections, native MySQL look & feel The above features yield several benefits for a DBMS clustering solution, including: - No slave lag - No lost transactions - Both read and write scalability - Smaller client latencies It uses the Galera library for the replication implementation with wsrep API. wsrep patch compatible with databases/galera https://code.launchpad.net/~maria-captains/maria/maria-5.5-galera WWW: https://downloads.mariadb.org/mariadb-galera/ >How-To-Repeat: >Fix: Build log: https://redports.org/buildarchive/20140401043335-48152/ 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: # # mariadb55-galera-client # mariadb55-galera-client/files # mariadb55-galera-client/files/patch-CMakeLists.txt # mariadb55-galera-client/files/patch-scripts__mysql_config.sh # mariadb55-galera-client/files/patch-scripts__CMakeLists.txt # mariadb55-galera-client/files/patch-regex__CMakeLists.txt # mariadb55-galera-client/files/patch-mysys__default.c # mariadb55-galera-client/files/patch-man__CMakeLists.txt # mariadb55-galera-client/files/patch-libservices__CMakeLists.txt # mariadb55-galera-client/files/patch-include__my_compare.h # mariadb55-galera-client/files/patch-include__CMakeLists.txt # mariadb55-galera-client/files/patch-extra__yassl__taocrypt__src__integer.cpp # mariadb55-galera-client/files/patch-extra__CMakeLists.txt # mariadb55-galera-client/files/patch-cmake__jemalloc.cmake # mariadb55-galera-client/files/patch-client__CMakeLists.txt # mariadb55-galera-client/files/patch-support-files__CMakeLists.txt # mariadb55-galera-client/Makefile # mariadb55-galera-client/pkg-plist # echo c - mariadb55-galera-client mkdir -p mariadb55-galera-client > /dev/null 2>&1 echo c - mariadb55-galera-client/files mkdir -p mariadb55-galera-client/files > /dev/null 2>&1 echo x - mariadb55-galera-client/files/patch-CMakeLists.txt sed 's/^X//' >mariadb55-galera-client/files/patch-CMakeLists.txt << '7a3fa0fa742246d9088626a90278b1de' X--- ./CMakeLists.txt.orig 2014-03-28 04:18:29.000000000 -0400 X+++ ./CMakeLists.txt 2014-03-28 04:20:34.000000000 -0400 X@@ -404,29 +404,8 @@ X ADD_SUBDIRECTORY(extra) X ADD_SUBDIRECTORY(libservices) X ADD_SUBDIRECTORY(scripts) X-ADD_SUBDIRECTORY(sql/share) X ADD_SUBDIRECTORY(support-files) X X-IF(NOT WITHOUT_SERVER) X- ADD_SUBDIRECTORY(tests) X- ADD_SUBDIRECTORY(sql) 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(sql-bench) X- 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-ENDIF() X- X IF(UNIX) X ADD_SUBDIRECTORY(man) X ENDIF() X@@ -438,7 +417,6 @@ X ADD_SUBDIRECTORY(win/upgrade_wizard) X ADD_SUBDIRECTORY(win/packaging) X ENDIF() X-ADD_SUBDIRECTORY(packaging/solaris) X X CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/my_config.h) X CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/config.h) X@@ -471,6 +449,7 @@ X WORKING_DIRECTORY ${CMAKE_BINARY_DIR} X ) X X+IF(FALSE) X INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER X COMPONENT Readme) X INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC X@@ -478,6 +457,7 @@ X IF(UNIX) X INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme) X ENDIF() X+ENDIF() X X INCLUDE(CPack) X 7a3fa0fa742246d9088626a90278b1de echo x - mariadb55-galera-client/files/patch-scripts__mysql_config.sh sed 's/^X//' >mariadb55-galera-client/files/patch-scripts__mysql_config.sh << 'e3df40333cc123b73de82423711cf17a' X--- ./scripts/mysql_config.sh.orig 2014-03-28 13:04:57.000000000 -0400 X+++ ./scripts/mysql_config.sh 2014-03-28 13:05:31.000000000 -0400 X@@ -108,8 +108,11 @@ X # We intentionally add a space to the beginning and end of lib strings, simplifies replace later X libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" X libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " X+libs="$libs -L%%LOCALBASE%%/lib " X libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " X+libs_r="$libs_r -L%%LOCALBASE%%/lib " X embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " X+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib " X X if [ -r "$pkglibdir/libmygcc.a" ]; then X # When linking against the static library with a different version of GCC e3df40333cc123b73de82423711cf17a echo x - mariadb55-galera-client/files/patch-scripts__CMakeLists.txt sed 's/^X//' >mariadb55-galera-client/files/patch-scripts__CMakeLists.txt << 'ca83d3e0f061460d725b6688fd25a1d6' X--- ./scripts/CMakeLists.txt.orig 2014-03-28 16:23:00.000000000 -0400 X+++ ./scripts/CMakeLists.txt 2014-03-28 16:29:36.000000000 -0400 X@@ -72,6 +72,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@@ -81,6 +82,7 @@ X ${FIX_PRIVILEGES_SQL} X DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server X ) X+ENDIF() X X # TCMalloc hacks X IF(MALLOC_LIB) X@@ -140,6 +142,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@@ -180,6 +183,7 @@ X DESTINATION ${INSTALL_BINDIR} X COMPONENT Server X ) X+ENDIF() X X ENDIF(UNIX) X X@@ -204,6 +208,7 @@ X SET(localstatedir ${MYSQL_DATADIR}) X ENDIF() X X+IF() X IF(UNIX) X CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh X ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) X@@ -219,6 +224,7 @@ X COMPONENT Server X ) X ENDIF() X+ENDIF() X X SET(prefix "${CMAKE_INSTALL_PREFIX}") X SET(sysconfdir ${prefix}) X@@ -269,6 +275,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@@ -327,19 +335,8 @@ X SET(BIN_SCRIPTS X msql2mysql X mysql_config X- mysql_fix_extensions X- mysql_setpermission X- mysql_secure_installation X- mysql_zap X mysqlaccess X- mysql_convert_table_format X mysql_find_rows X- mytop 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) ca83d3e0f061460d725b6688fd25a1d6 echo x - mariadb55-galera-client/files/patch-regex__CMakeLists.txt sed 's/^X//' >mariadb55-galera-client/files/patch-regex__CMakeLists.txt << '242d9a231f11500f4e49c884e8a49299' X--- ./regex/CMakeLists.txt.orig 2014-03-28 13:01:22.000000000 -0400 X+++ ./regex/CMakeLists.txt 2014-03-28 13:01:52.000000000 -0400 X@@ -18,4 +18,6 @@ X SET(REGEX_SOURCES regcomp.c regerror.c regexec.c regfree.c reginit.c) X ADD_CONVENIENCE_LIBRARY(regex ${REGEX_SOURCES}) X X+IF(FALSE) X INSTALL(FILES "my_regex.h" DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development) X+ENDIF() 242d9a231f11500f4e49c884e8a49299 echo x - mariadb55-galera-client/files/patch-mysys__default.c sed 's/^X//' >mariadb55-galera-client/files/patch-mysys__default.c << 'c8c9d77f8af96242d6db8aec3173a61d' X--- ./mysys/default.c.orig 2014-03-28 12:59:17.000000000 -0400 X+++ ./mysys/default.c 2014-03-28 13:01:00.000000000 -0400 X@@ -95,7 +95,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@@ -791,7 +791,7 @@ X { X MY_STAT stat_info; X if (!my_stat(name,&stat_info,MYF(0))) X- return 1; X+ return 0; X /* X Ignore world-writable regular files. X This is mainly done to protect us to not read a file created by X@@ -1241,6 +1241,7 @@ X #if defined(DEFAULT_SYSCONFDIR) X if (DEFAULT_SYSCONFDIR[0]) X errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); X+ errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs); X #endif /* DEFAULT_SYSCONFDIR */ X X #endif c8c9d77f8af96242d6db8aec3173a61d echo x - mariadb55-galera-client/files/patch-man__CMakeLists.txt sed 's/^X//' >mariadb55-galera-client/files/patch-man__CMakeLists.txt << '621d79baca36ace5133d70dfd45e0f27' X--- ./man/CMakeLists.txt.orig 2014-03-28 12:56:44.000000000 -0400 X+++ ./man/CMakeLists.txt 2014-03-28 12:58:16.000000000 -0400 X@@ -31,9 +31,13 @@ X SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1 X mysqltest_embedded.1 mysql_client_test_embedded.1) X X+IF(FALSE) X INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer) X INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer) X+ENDIF() X INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient) X INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment) X+IF(FALSE) X INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest) X+ENDIF() X 621d79baca36ace5133d70dfd45e0f27 echo x - mariadb55-galera-client/files/patch-libservices__CMakeLists.txt sed 's/^X//' >mariadb55-galera-client/files/patch-libservices__CMakeLists.txt << '82de118c7a6b1ce53252eae20e68d8c5' X--- ./libservices/CMakeLists.txt.orig 2014-03-28 12:55:34.000000000 -0400 X+++ ./libservices/CMakeLists.txt 2014-03-28 12:56:08.000000000 -0400 X@@ -26,4 +26,6 @@ X logger_service.c) X X ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) X+IF(FALSE) X INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) X+ENDIF() 82de118c7a6b1ce53252eae20e68d8c5 echo x - mariadb55-galera-client/files/patch-include__my_compare.h sed 's/^X//' >mariadb55-galera-client/files/patch-include__my_compare.h << 'f08447670a9cdb4c3272bf91cf8e1ec5' X--- ./include/my_compare.h.orig 2014-03-28 13:14:36.000000000 -0400 X+++ ./include/my_compare.h 2014-03-28 13:14:59.000000000 -0400 X@@ -40,7 +40,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 32 /* Max segments for key */ X X #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) f08447670a9cdb4c3272bf91cf8e1ec5 echo x - mariadb55-galera-client/files/patch-include__CMakeLists.txt sed 's/^X//' >mariadb55-galera-client/files/patch-include__CMakeLists.txt << '65f6af4086c3854bcfdcbfce122439e8' X--- ./include/CMakeLists.txt.orig 2014-03-28 04:30:12.000000000 -0400 X+++ ./include/CMakeLists.txt 2014-03-28 04:32:13.000000000 -0400 X@@ -59,13 +59,18 @@ X FOREACH(f ${HEADERS_GEN_CONFIGURE}) X INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) X ENDFOREACH(f) X-INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h") X+INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development X+ FILES_MATCHING PATTERN "*.h" X+ PATTERN "psi_abi*" EXCLUDE X+) X X STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}") X STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}") X X+IF(FALSE) X INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development X FILES_MATCHING PATTERN "*.h" X PATTERN CMakeFiles EXCLUDE X PATTERN mysql EXCLUDE X REGEX "\\./(${EXCL_RE}$)" EXCLUDE) X+ENDIF() 65f6af4086c3854bcfdcbfce122439e8 echo x - mariadb55-galera-client/files/patch-extra__yassl__taocrypt__src__integer.cpp sed 's/^X//' >mariadb55-galera-client/files/patch-extra__yassl__taocrypt__src__integer.cpp << 'b30cb97dd29b1ec9943824ae5c048615' X--- ./extra/yassl/taocrypt/src/integer.cpp.orig 2014-03-28 04:29:03.000000000 -0400 X+++ ./extra/yassl/taocrypt/src/integer.cpp 2014-03-28 04:29:42.000000000 -0400 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; b30cb97dd29b1ec9943824ae5c048615 echo x - mariadb55-galera-client/files/patch-extra__CMakeLists.txt sed 's/^X//' >mariadb55-galera-client/files/patch-extra__CMakeLists.txt << 'ed33f400e8b6a06c2da2190760ef5c8e' X--- ./extra/CMakeLists.txt.orig 2014-03-28 04:26:35.000000000 -0400 X+++ ./extra/CMakeLists.txt 2014-03-28 04:28:03.000000000 -0400 X@@ -54,6 +54,7 @@ X DEPENDS X ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp) X X+IF(FALSE) X MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) X TARGET_LINK_LIBRARIES(my_print_defaults mysys) X X@@ -74,11 +75,14 @@ X X MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server) X TARGET_LINK_LIBRARIES(replace mysys) X+ENDIF() X IF(UNIX) X+IF(FALSE) X MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.c) X X MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) X TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) X+ENDIF() X X MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client) X TARGET_LINK_LIBRARIES(mysql_waitpid mysys) ed33f400e8b6a06c2da2190760ef5c8e echo x - mariadb55-galera-client/files/patch-cmake__jemalloc.cmake sed 's/^X//' >mariadb55-galera-client/files/patch-cmake__jemalloc.cmake << '8a10f15b1abf781d1f238da7b4175c7a' X--- ./cmake/jemalloc.cmake.orig 2014-03-28 04:24:54.000000000 -0400 X+++ ./cmake/jemalloc.cmake 2014-03-28 04:26:03.000000000 -0400 X@@ -50,9 +50,9 @@ X X MACRO (CHECK_JEMALLOC) X IF(WITH_JEMALLOC STREQUAL "system" OR WITH_JEMALLOC STREQUAL "yes") X- CHECK_LIBRARY_EXISTS(jemalloc malloc_stats_print "" HAVE_JEMALLOC) X+ CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC) X IF (HAVE_JEMALLOC) X- SET(LIBJEMALLOC jemalloc) X+ SET(LIBJEMALLOC c) X ELSEIF (WITH_JEMALLOC STREQUAL "system") X MESSAGE(FATAL_ERROR "system jemalloc is not found") X ELSEIF (WITH_JEMALLOC STREQUAL "yes") 8a10f15b1abf781d1f238da7b4175c7a echo x - mariadb55-galera-client/files/patch-client__CMakeLists.txt sed 's/^X//' >mariadb55-galera-client/files/patch-client__CMakeLists.txt << 'c5d39dc5fe1cf4b6bfd62294214bf50c' X--- ./client/CMakeLists.txt.orig 2014-03-28 04:20:53.000000000 -0400 X+++ ./client/CMakeLists.txt 2014-03-28 04:24:19.000000000 -0400 X@@ -34,11 +34,12 @@ X SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) 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 SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) X- X+ENDIF() X X MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) X TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) X@@ -49,15 +50,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 COMPONENT Server) 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@@ -75,10 +80,12 @@ X ENDIF(WIN32) X X # async_example is just a code example, do not install it. X+IF(FALSE) X ADD_EXECUTABLE(async_example async_example.c) X TARGET_LINK_LIBRARIES(async_example mysqlclient) X+ENDIF() X X-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin X+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap X PROPERTIES HAS_CXX TRUE) X X ADD_DEFINITIONS(-DHAVE_DLOPEN) c5d39dc5fe1cf4b6bfd62294214bf50c echo x - mariadb55-galera-client/files/patch-support-files__CMakeLists.txt sed 's/^X//' >mariadb55-galera-client/files/patch-support-files__CMakeLists.txt << '88ee26e63359de28c267ddcb6b5ba92f' X--- ./support-files/CMakeLists.txt.orig 2014-03-28 16:30:36.000000000 -0400 X+++ ./support-files/CMakeLists.txt 2014-03-28 16:32:22.000000000 -0400 X@@ -41,15 +41,18 @@ X SET(inst_location ${INSTALL_SUPPORTFILESDIR}) X ENDIF() X X+IF(FALSE) X FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small wsrep) 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 ENDFOREACH() 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 config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini) X CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh X@@ -68,8 +71,10 @@ X INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) X INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 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@@ -129,3 +134,4 @@ X COMPONENT SupportFiles) X ENDIF(INSTALL_SYSCONFDIR) X ENDIF() X+ENDIF() 88ee26e63359de28c267ddcb6b5ba92f echo x - mariadb55-galera-client/Makefile sed 's/^X//' >mariadb55-galera-client/Makefile << '7231b655d794ceb70a30077993d0bcde' X# $FreeBSD$ X XPORTNAME= mariadb XPKGNAMESUFFIX= 55-galera-client X XCOMMENT= Multithreaded SQL database with wsrep patch (client) X XMASTERDIR= ${.CURDIR}/../mariadb55-galera-server X XPKGMESSAGE= mustnotexist XPATCHDIR= ${.CURDIR}/files XPLIST= ${.CURDIR}/pkg-plist X XCONFLICTS_INSTALL= mysql[0-9][0-9]-client-* \ X mysql[0-9][0-9]-galera-client-* \ X mariadb[0-46-9][0-9]-client-* \ X mariadb[0-55-9][0-9]-client-* \ X mariadb5.[0-46-9]-client-* \ X percona[0-9][0-9]-client-* X XCMAKE_ARGS+= -DWITHOUT_SERVER=1 X XUSE_LDCONFIG= ${PREFIX}/lib/mysql X XCLIENT_ONLY= yes X X.include "${MASTERDIR}/Makefile" 7231b655d794ceb70a30077993d0bcde echo x - mariadb55-galera-client/pkg-plist sed 's/^X//' >mariadb55-galera-client/pkg-plist << 'fcfba35b2095be532e2de398fbe43f28' Xbin/msql2mysql Xbin/mysql Xbin/mysql_config Xbin/mysql_find_rows Xbin/mysql_waitpid Xbin/mysqlaccess Xbin/mysqladmin Xbin/mysqlbinlog Xbin/mysqlcheck Xbin/mysqldump Xbin/mysqlimport Xbin/mysqlshow Xbin/mysqlslap Xinclude/mysql/auth_dialog_client.h Xinclude/mysql/client_plugin.h Xinclude/mysql/decimal.h Xinclude/mysql/errmsg.h Xinclude/mysql/handler_ername.h Xinclude/mysql/handler_state.h Xinclude/mysql/keycache.h Xinclude/mysql/m_ctype.h Xinclude/mysql/m_string.h Xinclude/mysql/ma_dyncol.h Xinclude/mysql/my_alloc.h Xinclude/mysql/my_attribute.h Xinclude/mysql/my_compiler.h Xinclude/mysql/my_config.h Xinclude/mysql/my_dbug.h Xinclude/mysql/my_decimal_limits.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_valgrind.h Xinclude/mysql/my_xml.h Xinclude/mysql/mysql.h Xinclude/mysql/mysql_com.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_auth.h Xinclude/mysql/plugin_auth_common.h Xinclude/mysql/plugin_ftparser.h Xinclude/mysql/psi/mysql_file.h Xinclude/mysql/psi/mysql_thread.h Xinclude/mysql/psi/psi.h Xinclude/mysql/service_debug_sync.h Xinclude/mysql/service_kill_statement.h Xinclude/mysql/service_logger.h Xinclude/mysql/service_my_snprintf.h Xinclude/mysql/service_progress_report.h Xinclude/mysql/service_thd_alloc.h Xinclude/mysql/service_thd_wait.h Xinclude/mysql/service_thread_scheduler.h Xinclude/mysql/services.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 Xman/man1/msql2mysql.1.gz Xman/man1/mysql.1.gz Xman/man1/mysql_config.1.gz Xman/man1/mysql_find_rows.1.gz Xman/man1/mysql_plugin.1.gz Xman/man1/mysql_waitpid.1.gz Xman/man1/mysqlaccess.1.gz Xman/man1/mysqladmin.1.gz Xman/man1/mysqlbinlog.1.gz Xman/man1/mysqlcheck.1.gz Xman/man1/mysqldump.1.gz Xman/man1/mysqlimport.1.gz Xman/man1/mysqlshow.1.gz Xman/man1/mysqlslap.1.gz Xshare/aclocal/mysql.m4 X@dirrm lib/mysql X@dirrm include/mysql/psi X@dirrm include/mysql fcfba35b2095be532e2de398fbe43f28 exit >Release-Note: >Audit-Trail: >Unformatted: