Date: Fri, 2 May 2014 16:57:16 GMT From: Daniel Ylitalo <daniel@blodan.se> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/189257: [NEW PORT] databases/percona56-xtradb-cluster Message-ID: <201405021657.s42GvGgX088024@cgiserv.freebsd.org> Resent-Message-ID: <201405021700.s42H001x080186@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 189257 >Category: ports >Synopsis: [NEW PORT] databases/percona56-xtradb-cluster >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri May 02 17:00:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Daniel Ylitalo >Release: 9.2-RELEASE-p4 >Organization: >Environment: FreeBSD gramse.blodan.se 9.2-RELEASE-p4 FreeBSD 9.2-RELEASE-p4 #3: Sun Apr 27 13:35:56 CEST 2014 daniel@gramse.blodan.se:/usr/obj/usr/src/sys/GENERIC amd64 >Description: I've been talking to flo who's the maintainer of the percona database software amongst others, he told me to create a PR to get this port committed as he didn't have time. >How-To-Repeat: >Fix: Attaching finished port Who ever commits this needs to add conflicts for percona[0-9][0-9]-xtradb-cluster* to these ports: databases/mysql55-server databases/mysql56-server databases/mariadb-server databases/mariadb55-server 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: # # percona56-xtradb-cluster # percona56-xtradb-cluster/distinfo # percona56-xtradb-cluster/Makefile # percona56-xtradb-cluster/pkg-descr # percona56-xtradb-cluster/pkg-message # percona56-xtradb-cluster/pkg-plist # percona56-xtradb-cluster/files # percona56-xtradb-cluster/files/mysql-server.in # percona56-xtradb-cluster/files/patch-client_CMakeLists.txt # percona56-xtradb-cluster/files/patch-CMakeLists.txt # percona56-xtradb-cluster/files/patch-cmake_plugin.cmake # percona56-xtradb-cluster/files/patch-extra_CMakeLists.txt # percona56-xtradb-cluster/files/patch-extra_yassl_taocrypt_include_misc.hpp # percona56-xtradb-cluster/files/patch-extra_yassl_taocrypt_src_integer.cpp # percona56-xtradb-cluster/files/patch-include_CMakeLists.txt # percona56-xtradb-cluster/files/patch-include_myisam.h # percona56-xtradb-cluster/files/patch-include_my_compare.h # percona56-xtradb-cluster/files/patch-libmysql_CMakeLists.txt # percona56-xtradb-cluster/files/patch-libservices_CMakeLists.txt # percona56-xtradb-cluster/files/patch-man_CMakeLists.txt # percona56-xtradb-cluster/files/patch-mysys_ssl_my_default.cc # percona56-xtradb-cluster/files/patch-mysys__posix_timers.c # percona56-xtradb-cluster/files/patch-plugin_password_validation_validate_password.cc # percona56-xtradb-cluster/files/patch-scripts_CMakeLists.txt # percona56-xtradb-cluster/files/patch-scripts_mysqld_safe.sh # percona56-xtradb-cluster/files/patch-scripts_wsrep_sst_xtrabackup-v2.sh # percona56-xtradb-cluster/files/patch-scripts_wsrep_sst_xtrabackup.sh # percona56-xtradb-cluster/files/patch-sql_CMakeLists.txt # percona56-xtradb-cluster/files/patch-sql_sql_trigger.cc # percona56-xtradb-cluster/files/patch-sql_sql_view.cc # percona56-xtradb-cluster/files/patch-sql_sys_vars.cc # percona56-xtradb-cluster/files/patch-support-files_CMakeLists.txt # echo c - percona56-xtradb-cluster mkdir -p percona56-xtradb-cluster > /dev/null 2>&1 echo x - percona56-xtradb-cluster/distinfo sed 's/^X//' >percona56-xtradb-cluster/distinfo << 'daa5d3c78df8546e1c13ef335dc4923c' XSHA256 (Percona-XtraDB-Cluster-5.6.15.tar.gz) = bd2a3a5ebfdfae213051f4d6bdf744a8fd2cccc207e9d56f70f867c233e989fe XSIZE (Percona-XtraDB-Cluster-5.6.15.tar.gz) = 34723074 daa5d3c78df8546e1c13ef335dc4923c echo x - percona56-xtradb-cluster/Makefile sed 's/^X//' >percona56-xtradb-cluster/Makefile << 'aa8e4228bcc405e1492df5f7b388a83d' X# Created by: Alex Dupre <ale@FreeBSD.org> X# Created by: Daniel Ylitalo <daniel@blodan.se> X# $FreeBSD$ X XPORTNAME?= percona XDISTVERSION= 5.6.15 XPORTREVISION?= 0 XCATEGORIES= databases ipv6 XMASTER_SITES= http://www.percona.com/redir/downloads/Percona-XtraDB-Cluster-56/release-${DISTVERSION}-25.5/source/ XPKGNAMESUFFIX?= 56-XtraDB-Cluster XDISTNAME= Percona-XtraDB-Cluster-5.6.15 XDISTFILES= Percona-XtraDB-Cluster-5.6.15.tar.gz X XMAINTAINER= flo@FreeBSD.org XCOMMENT?= Multithreaded SQL database (server) X XSLAVEDIRS= databases/percona56-client XUSES= bison cmake shebangfix X XRUN_DEPENDS= ${LOCALBASE}/bin/socat:${PORTSDIR}/net/socat \ X ${LOCALBASE}/lib/libgalera_smm.so:${PORTSDIR}/databases/galera \ X ${LOCALBASE}/bin/innobackupex:${PORTSDIR}/databases/xtrabackup \ X ${LOCALBASE}/lib/gcc47:${PORTSDIR}/lang/gcc X XOPTIONS_DEFINE= OPENSSL FASTMTX SST_RSYNC XOPTIONS_DEFAULT= OPENSSL XFASTMTX_DESC= Replace mutexes with spinlocks X XSST_RSYNC_DESC= Support for rsync SST (not recommended) X XOPTIONS_DEFAULT= OPENSSL X XDATADIR= ${PREFIX}/share/mysql X XCMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ X -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ X -DINSTALL_INCLUDEDIR="include/mysql" \ X -DINSTALL_INFODIR="info" \ X -DINSTALL_LIBDIR="lib/mysql" \ X -DINSTALL_MANDIR="man" \ X -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ X -DINSTALL_MYSQLSHAREDIR="share/mysql" \ X -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ X -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ X -DINSTALL_SBINDIR="libexec" \ X -DINSTALL_SCRIPTDIR="bin" \ X -DINSTALL_SHAREDIR="share" \ X -DINSTALL_SQLBENCHDIR="share/mysql" \ X -DINSTALL_SUPPORTFILESDIR="share/mysql" \ X -DWITH_EDITLINE=system \ X -DWITH_LIBWRAP=1 \ X -DHAVE_PAM=0 \ X -DWITH_WSREP=1 X XSHEBANG_FILES= scripts/*.pl* scripts/*.sh X X.ifdef USE_MYSQL X.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. X.endif X X.include <bsd.port.options.mk> X X.if ${PORT_OPTIONS:MSST_RSYNC} XRUN_DEPENDS+= ${LOCALBASE}/bin/rsync:${PORTSDIR}/net/rsync X.endif X X.if ${PORT_OPTIONS:MOPENSSL} XCMAKE_ARGS+= -DWITH_SSL=bundled X.endif X X.if ${PORT_OPTIONS:MFASTMTX} XCMAKE_ARGS+= -DWITH_FAST_MUTEXES=1 X.endif X X# MySQL-Server part X.if !defined(CLIENT_ONLY) XUSE_MYSQL= yes XWANT_MYSQL_VER= 56p X XCONFLICTS_INSTALL= mysql[0-9][0-9]-server-* mariadb[0-9][0-9]-server-* percona5.[0-57-9]-server-* percona[0-46-9][0-9]-server-* X XUSE_RC_SUBR= mysql-server X XUSERS= mysql XGROUPS= mysql X XINFO= mysql X XMANPAGES= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \ X mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \ X mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \ X mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \ X mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \ X mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 X XCMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" X Xpost-install: X @${MKDIR} ${STAGEDIR}/var/db/mysql X @${RM} -rf ${STAGEDIR}${PREFIX}/xinetd.d X X.endif X Xpost-patch: X @${REINPLACE_CMD} 's/*.1/${MANPAGES}/' ${WRKSRC}/man/CMakeLists.txt X X.include <bsd.port.pre.mk> X X.if ${ARCH} == "arm" XBROKEN= Does not compile on arm X.endif X X.include <bsd.port.post.mk> aa8e4228bcc405e1492df5f7b388a83d echo x - percona56-xtradb-cluster/pkg-descr sed 's/^X//' >percona56-xtradb-cluster/pkg-descr << '7cdf5bd02ca742fbdeb676be3f295cfb' XPercona XtraDB Cluster is an active/active high availability and high scalability open source solution for MySQL clustering. X XIt integrates Percona Server and Percona XtraBackup with the Galera library of MySQL high Xavailability solutions in a single package which enables you to create a cost-effective MySQL high availability cluster. X XWWW: http://www.percona.com/software/percona-xtradb-cluster 7cdf5bd02ca742fbdeb676be3f295cfb echo x - percona56-xtradb-cluster/pkg-message sed 's/^X//' >percona56-xtradb-cluster/pkg-message << '8b67a74cc80264f2c7bbbac7ffff664a' X************************************************************************ X XRemember to run mysql_upgrade the first time you start the MySQL server Xafter an upgrade from an earlier version. X X************************************************************************ X XMinimal working my.cnf: X X[mysqld] Xwsrep_provider=/usr/local/lib/libgalera_smm.so Xwsrep_cluster_name=myFirstCluster Xwsrep_cluster_address=gcomm:// Xwsrep_node_name=hostname.ofmyserver.com Xwsrep_node_address=123.123.123.123 Xwsrep_sst_method=xtrabackup-v2 Xwsrep_sst_auth="a_username_with_privileges:password_to_match_user" Xwsrep_slave_threads=8 Xbinlog_format=ROW Xdefault_storage_engine=InnoDB Xinnodb_autoinc_lock_mode=2 Xinnodb_locks_unsafe_for_binlog=1 X X************************************************************************ X XPlease read through the manual: Xhttp://www.percona.com/doc/percona-xtradb-cluster/5.6/index.html X X************************************************************************ 8b67a74cc80264f2c7bbbac7ffff664a echo x - percona56-xtradb-cluster/pkg-plist sed 's/^X//' >percona56-xtradb-cluster/pkg-plist << 'f5dceaaffef9bb428f80346fe02e7f33' X@stopdaemon mysql-server Xbin/innochecksum Xbin/my_print_defaults Xbin/myisam_ftdump Xbin/myisamchk Xbin/myisamlog Xbin/myisampack Xbin/mysql_convert_table_format Xbin/mysql_fix_extensions Xbin/mysql_install_db Xbin/mysql_plugin Xbin/mysql_secure_installation Xbin/mysql_setpermission Xbin/mysql_tzinfo_to_sql Xbin/mysql_upgrade Xbin/mysql_zap Xbin/mysqlbug Xbin/mysqld_multi Xbin/mysqld_safe Xbin/mysqldumpslow Xbin/mysqlhotcopy Xbin/mysqltest Xbin/perror Xbin/replace Xbin/resolve_stack_dump Xbin/resolveip Xbin/clustercheck Xbin/pyclustercheck Xbin/wsrep_sst_common Xbin/wsrep_sst_mysqldump Xbin/wsrep_sst_rsync Xbin/wsrep_sst_xtrabackup Xbin/wsrep_sst_xtrabackup-v2 Xlib/mysql/plugin/adt_null.so Xlib/mysql/plugin/auth.so Xlib/mysql/plugin/auth_test_plugin.so Xlib/mysql/plugin/daemon_example.ini Xlib/mysql/plugin/libdaemon_example.so Xlib/mysql/plugin/mypluglib.so Xlib/mysql/plugin/qa_auth_client.so Xlib/mysql/plugin/qa_auth_interface.so Xlib/mysql/plugin/qa_auth_server.so Xlib/mysql/plugin/semisync_master.so Xlib/mysql/plugin/semisync_slave.so Xlib/mysql/plugin/validate_password.so Xlibexec/mysqld 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.server.1.gz Xman/man1/mysql_convert_table_format.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_zap.1.gz Xman/man1/mysqlbug.1.gz Xman/man1/mysqld_multi.1.gz Xman/man1/mysqld_safe.1.gz Xman/man1/mysqldumpslow.1.gz Xman/man1/mysqlhotcopy.1.gz Xman/man1/mysqlman.1.gz Xman/man1/mysqltest.1.gz Xman/man1/perror.1.gz Xman/man1/replace.1.gz Xman/man1/resolve_stack_dump.1.gz Xman/man1/resolveip.1.gz Xman/man8/mysqld.8.gz X%%DATADIR%%/binary-configure X%%DATADIR%%/bulgarian/errmsg.sys X%%DATADIR%%/charsets/Index.xml X%%DATADIR%%/charsets/README X%%DATADIR%%/charsets/armscii8.xml X%%DATADIR%%/charsets/ascii.xml X%%DATADIR%%/charsets/cp1250.xml X%%DATADIR%%/charsets/cp1251.xml X%%DATADIR%%/charsets/cp1256.xml X%%DATADIR%%/charsets/cp1257.xml X%%DATADIR%%/charsets/cp850.xml X%%DATADIR%%/charsets/cp852.xml X%%DATADIR%%/charsets/cp866.xml X%%DATADIR%%/charsets/dec8.xml X%%DATADIR%%/charsets/geostd8.xml X%%DATADIR%%/charsets/greek.xml X%%DATADIR%%/charsets/hebrew.xml X%%DATADIR%%/charsets/hp8.xml X%%DATADIR%%/charsets/keybcs2.xml X%%DATADIR%%/charsets/koi8r.xml X%%DATADIR%%/charsets/koi8u.xml X%%DATADIR%%/charsets/latin1.xml X%%DATADIR%%/charsets/latin2.xml X%%DATADIR%%/charsets/latin5.xml X%%DATADIR%%/charsets/latin7.xml X%%DATADIR%%/charsets/macce.xml X%%DATADIR%%/charsets/macroman.xml X%%DATADIR%%/charsets/swe7.xml X%%DATADIR%%/czech/errmsg.sys X%%DATADIR%%/danish/errmsg.sys X%%DATADIR%%/dictionary.txt X%%DATADIR%%/dutch/errmsg.sys X%%DATADIR%%/english/errmsg.sys X%%DATADIR%%/errmsg-utf8.txt X%%DATADIR%%/estonian/errmsg.sys X%%DATADIR%%/fill_help_tables.sql X%%DATADIR%%/french/errmsg.sys X%%DATADIR%%/german/errmsg.sys X%%DATADIR%%/greek/errmsg.sys X%%DATADIR%%/hungarian/errmsg.sys X%%DATADIR%%/innodb_memcached_config.sql X%%DATADIR%%/italian/errmsg.sys X%%DATADIR%%/japanese/errmsg.sys X%%DATADIR%%/korean/errmsg.sys X%%DATADIR%%/magic X%%DATADIR%%/my-default.cnf X%%DATADIR%%/mysql-log-rotate X%%DATADIR%%/mysql.server X%%DATADIR%%/mysql_security_commands.sql X%%DATADIR%%/mysql_system_tables.sql X%%DATADIR%%/mysql_system_tables_data.sql X%%DATADIR%%/mysql_test_data_timezone.sql X%%DATADIR%%/mysqld_multi.server X%%DATADIR%%/norwegian-ny/errmsg.sys X%%DATADIR%%/norwegian/errmsg.sys X%%DATADIR%%/polish/errmsg.sys X%%DATADIR%%/portuguese/errmsg.sys X%%DATADIR%%/romanian/errmsg.sys X%%DATADIR%%/russian/errmsg.sys X%%DATADIR%%/serbian/errmsg.sys X%%DATADIR%%/slovak/errmsg.sys X%%DATADIR%%/spanish/errmsg.sys X%%DATADIR%%/swedish/errmsg.sys X%%DATADIR%%/ukrainian/errmsg.sys X%%DATADIR%%/wsrep_notify X@dirrm lib/mysql/plugin X@dirrmtry lib/mysql X@dirrm %%DATADIR%%/bulgarian X@dirrm %%DATADIR%%/charsets X@dirrm %%DATADIR%%/czech X@dirrm %%DATADIR%%/danish X@dirrm %%DATADIR%%/dutch X@dirrm %%DATADIR%%/english X@dirrm %%DATADIR%%/estonian X@dirrm %%DATADIR%%/french X@dirrm %%DATADIR%%/german X@dirrm %%DATADIR%%/greek X@dirrm %%DATADIR%%/hungarian X@dirrm %%DATADIR%%/italian X@dirrm %%DATADIR%%/japanese X@dirrm %%DATADIR%%/korean X@dirrm %%DATADIR%%/norwegian X@dirrm %%DATADIR%%/norwegian-ny X@dirrm %%DATADIR%%/polish X@dirrm %%DATADIR%%/portuguese X@dirrm %%DATADIR%%/romanian X@dirrm %%DATADIR%%/russian X@dirrm %%DATADIR%%/serbian X@dirrm %%DATADIR%%/slovak X@dirrm %%DATADIR%%/spanish X@dirrm %%DATADIR%%/swedish X@dirrm %%DATADIR%%/ukrainian X@dirrm %%DATADIR%% X@cwd /var X@dirrmtry db/mysql f5dceaaffef9bb428f80346fe02e7f33 echo c - percona56-xtradb-cluster/files mkdir -p percona56-xtradb-cluster/files > /dev/null 2>&1 echo x - percona56-xtradb-cluster/files/mysql-server.in sed 's/^X//' >percona56-xtradb-cluster/files/mysql-server.in << '20647a3ded8bff8f2fcb450a7a1ae9b8' X#!/bin/sh X# X# $FreeBSD$ X# X X# PROVIDE: mysql X# REQUIRE: LOGIN X# KEYWORD: shutdown X X# X# Add the following line to /etc/rc.conf to enable mysql: X# mysql_enable (bool): Set to "NO" by default. X# Set it to "YES" to enable MySQL. X# mysql_limits (bool): Set to "NO" by default. X# Set it to yes to run `limits -e -U mysql` X# just before mysql starts. X# mysql_dbdir (str): Default to "/var/db/mysql" X# Base database directory. X# mysql_optfile (str): Server-specific option file. X# Default to "${mysql_dbdir}/my.cnf". X# mysql_pidfile (str): Custum PID file path and name. X# Default to "${mysql_dbdir}/${hostname}.pid". X# mysql_args (str): Custom additional arguments to be passed X# to mysqld_safe (default empty). X# X X. /etc/rc.subr X Xname="mysql" Xrcvar=mysql_enable X Xload_rc_config $name X X: ${mysql_enable="NO"} X: ${mysql_limits="NO"} X: ${mysql_dbdir="/var/db/mysql"} X: ${mysql_optfile="${mysql_dbdir}/my.cnf"} X Xmysql_user="mysql" Xmysql_limits_args="-e -U ${mysql_user}" X: ${hostname:=`/bin/hostname`} Xpidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"} Xcommand="/usr/sbin/daemon" Xcommand_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" Xprocname="%%PREFIX%%/libexec/mysqld" Xstart_precmd="${name}_prestart" Xstart_postcmd="${name}_poststart" Xmysql_install_db="%%PREFIX%%/bin/mysql_install_db" Xmysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --defaults-extra-file=${mysql_optfile} --force" Xsst_progress_file="${mysql_dbdir}/sst_in_progress" Xexport LD_LIBRARY_PATH=/usr/local/lib/gcc47: X Xmysql_create_auth_tables() X{ X eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null X [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir} X} X Xmysql_prestart() X{ X if [ ! -f "${mysql_optfile}" ]; then X echo "You need to create a my.cnf file with a proper cluster config" X return 1 X fi X X if [ ! -d "${mysql_dbdir}/mysql/." ]; then X X eval /usr/bin/grep -qxE 'wsrep_cluster_address\=gcomm\://' ${mysql_optfile} X X if [ $? -eq 0 ]; then X echo "Node configured as bootstrap... creating initial data files" X mysql_create_auth_tables || return 1 X else X echo "Node configured as cluster node... skipping creation of initial data files" X fi X fi X X if checkyesno mysql_limits; then X eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null X else X return 0 X fi X} X Xmysql_poststart() X{ X local timeout=15 X while [ ! -f "${sst_progress_file}" -a ${timeout} -gt 0 ]; do X timeout=$(( timeout - 1 )) X X if [ -f "${pidfile}" ]; then X echo "mysqld started" X break X fi X sleep 1 X done X X if [ -f "${sst_progress_file}" ]; then X echo "SST in progress, please wait..." X while [ -f "${sst_progress_file}" ]; do X X running_procc=`/bin/ps auxwww|/usr/bin/grep mysqld|/usr/bin/grep -v 'grep'|wc -l` X X if [ "${running_procc}" -gt 0 ]; then X X sleep 1 X else X echo "mysqld has quit, check ${mysql_dbdir}/${hostname}.err" X return 1 X fi X X done X echo "SST finished." X fi X X return 0 X} X Xrun_rc_command "$1" 20647a3ded8bff8f2fcb450a7a1ae9b8 echo x - percona56-xtradb-cluster/files/patch-client_CMakeLists.txt sed 's/^X//' >percona56-xtradb-cluster/files/patch-client_CMakeLists.txt << '2b9a60f0cfb70a16abfb8b4697e57da3' X--- client/CMakeLists.txt.orig 2013-06-26 22:38:20.000000000 +0200 X+++ client/CMakeLists.txt 2013-06-28 18:54:21.482641124 +0200 X@@ -31,17 +31,20 @@ X COPY_OPENSSL_DLLS(copy_openssl_client) X X ADD_DEFINITIONS(${SSL_DEFINES}) X+IF(FALSE) X MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc) X TARGET_LINK_LIBRARIES(mysql mysqlclient) X IF(UNIX) X TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) X ENDIF(UNIX) X+ENDIF() X 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 X X+IF(FALSE) X MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) X TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) X X@@ -50,17 +53,21 @@ X X MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) X TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) X+ENDIF() X X MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) X TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) X ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) X X+IF(FALSE) X MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) X TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) X+ENDIF() X X MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) X TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) X X+IF(FALSE) X MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc) X TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) X X@@ -73,6 +80,7 @@ X X MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) X TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) X+ENDIF() X X # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". X IF(WIN32) X@@ -82,11 +90,6 @@ X SET_TARGET_PROPERTIES ( X mysql_plugin X mysql_upgrade X- mysqlcheck X- mysqldump X- mysqlimport X- mysqlshow X- mysqlslap X PROPERTIES HAS_CXX TRUE) X X ADD_DEFINITIONS(-DHAVE_DLOPEN) 2b9a60f0cfb70a16abfb8b4697e57da3 echo x - percona56-xtradb-cluster/files/patch-CMakeLists.txt sed 's/^X//' >percona56-xtradb-cluster/files/patch-CMakeLists.txt << '2eab36c09ee57b33601a2c50383fffe0' X--- CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100 X+++ CMakeLists.txt 2013-02-13 14:40:46.000000000 +0100 X@@ -379,7 +379,6 @@ 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@@ -387,14 +386,10 @@ 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@@ -439,7 +434,6 @@ 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@@ -452,6 +446,7 @@ 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@@ -477,3 +472,4 @@ X PATTERN "sp-imp-spec.txt" EXCLUDE X ) X ENDIF() X+ENDIF() 2eab36c09ee57b33601a2c50383fffe0 echo x - percona56-xtradb-cluster/files/patch-cmake_plugin.cmake sed 's/^X//' >percona56-xtradb-cluster/files/patch-cmake_plugin.cmake << '2cd77b5b3b3ebb6e5f5a268ce03b7931' X--- cmake/plugin.cmake.orig 2011-09-09 17:56:39.000000000 +0200 X+++ cmake/plugin.cmake 2011-10-07 10:56:37.000000000 +0200 X@@ -195,7 +195,6 @@ X OUTPUT_NAME "${ARG_MODULE_OUTPUT_NAME}") X # Install dynamic library X MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT Server) X- INSTALL_DEBUG_TARGET(${target} DESTINATION ${INSTALL_PLUGINDIR}/debug) X # Add installed files to list for RPMs X FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files X "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" 2cd77b5b3b3ebb6e5f5a268ce03b7931 echo x - percona56-xtradb-cluster/files/patch-extra_CMakeLists.txt sed 's/^X//' >percona56-xtradb-cluster/files/patch-extra_CMakeLists.txt << '5ac03665d78922fa8c2ad02bb1021838' X--- extra/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 X+++ extra/CMakeLists.txt 2013-02-13 14:35:11.000000000 +0100 X@@ -102,8 +102,10 @@ X TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl) X SET_TARGET_PROPERTIES(resolve_stack_dump PROPERTIES LINKER_LANGUAGE CXX) X X+IF(FALSE) X MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c) X TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl) X SET_TARGET_PROPERTIES(mysql_waitpid PROPERTIES LINKER_LANGUAGE CXX) X ENDIF() X+ENDIF() X 5ac03665d78922fa8c2ad02bb1021838 echo x - percona56-xtradb-cluster/files/patch-extra_yassl_taocrypt_include_misc.hpp sed 's/^X//' >percona56-xtradb-cluster/files/patch-extra_yassl_taocrypt_include_misc.hpp << '2d624265150bd3e60fd7ad5c8b34c34a' 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 2d624265150bd3e60fd7ad5c8b34c34a echo x - percona56-xtradb-cluster/files/patch-extra_yassl_taocrypt_src_integer.cpp sed 's/^X//' >percona56-xtradb-cluster/files/patch-extra_yassl_taocrypt_src_integer.cpp << '3544e92c17febae61a94c77d5d462d7a' 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<T>::pointer AlignedAllocator<T>::allocate( X size_type n, const void *) X { X- if (n > max_size()) X+ if (n > AlignedAllocator<T>::max_size()) X return 0; X if (n == 0) X return 0; 3544e92c17febae61a94c77d5d462d7a echo x - percona56-xtradb-cluster/files/patch-include_CMakeLists.txt sed 's/^X//' >percona56-xtradb-cluster/files/patch-include_CMakeLists.txt << 'd2ec6ebc69feb0f367e3f7ced7918dd9' X--- include/CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100 X+++ include/CMakeLists.txt 2013-02-13 14:53:40.000000000 +0100 X@@ -65,10 +65,12 @@ X ${HEADERS_GEN_CONFIGURE} X ) X X+IF(FALSE) X INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) X INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development X PATTERN "*.h" X PATTERN "psi_abi*" EXCLUDE X ) X+ENDIF() X X d2ec6ebc69feb0f367e3f7ced7918dd9 echo x - percona56-xtradb-cluster/files/patch-include_myisam.h sed 's/^X//' >percona56-xtradb-cluster/files/patch-include_myisam.h << '41d6f06addbdd723734e057fb4282a61' 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) 41d6f06addbdd723734e057fb4282a61 echo x - percona56-xtradb-cluster/files/patch-include_my_compare.h sed 's/^X//' >percona56-xtradb-cluster/files/patch-include_my_compare.h << '9ff3aaaba9baff749b376af896d2d61c' 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) 9ff3aaaba9baff749b376af896d2d61c echo x - percona56-xtradb-cluster/files/patch-libmysql_CMakeLists.txt sed 's/^X//' >percona56-xtradb-cluster/files/patch-libmysql_CMakeLists.txt << '019b88aeb702096d92766518f42b0110' X--- libmysql/CMakeLists.txt.orig 2013-08-29 06:17:11.000000000 +0200 X+++ libmysql/CMakeLists.txt 2013-08-30 13:32:02.595259466 +0200 X@@ -173,7 +173,7 @@ X ENDIF() X X # Merge several convenience libraries into one big mysqlclient X-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) X+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL) X X # Visual Studio users need debug static library for debug projects X IF(MSVC) X@@ -186,6 +186,7 @@ X SET(${out_name} ${name}) X ENDMACRO() X X+IF(FALSE) X IF(UNIX) X MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) X SET(DOT_VERSION ".${VERSION}") X@@ -206,13 +207,15 @@ X ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a X ${INSTALL_LIBDIR} Development) X ENDIF() X+ENDIF() X X IF(NOT DISABLE_SHARED) X # Merge several convenience libraries into one big mysqlclient X # and link them together into shared library. X MERGE_LIBRARIES(libmysql SHARED ${LIBS} X EXPORTS ${CLIENT_API_FUNCTIONS} X- COMPONENT SharedLibraries) X+ COMPONENT SharedLibraries NOINSTALL) X+IF(FALSE) X IF(UNIX) X # libtool compatability X IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) X@@ -272,3 +275,4 @@ X ENDFOREACH() X ENDIF() X ENDIF() X+ENDIF() 019b88aeb702096d92766518f42b0110 echo x - percona56-xtradb-cluster/files/patch-libservices_CMakeLists.txt sed 's/^X//' >percona56-xtradb-cluster/files/patch-libservices_CMakeLists.txt << '0fca1e3e0f8766aa2ccbee8a00dec0e5' X--- libservices/CMakeLists.txt.orig 2010-12-23 17:13:03.000000000 +0100 X+++ libservices/CMakeLists.txt 2010-12-23 17:13:17.000000000 +0100 X@@ -22,4 +22,6 @@ X my_thread_scheduler_service.c) X X ADD_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) X+IF(FALSE) X INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) X+ENDIF() 0fca1e3e0f8766aa2ccbee8a00dec0e5 echo x - percona56-xtradb-cluster/files/patch-man_CMakeLists.txt sed 's/^X//' >percona56-xtradb-cluster/files/patch-man_CMakeLists.txt << 'f31334d4f77328fded24f38f804d09cc' X--- man/CMakeLists.txt.orig 2011-10-22 14:36:06.000000000 +0200 X+++ man/CMakeLists.txt 2011-10-22 14:36:23.000000000 +0200 X@@ -15,8 +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) f31334d4f77328fded24f38f804d09cc echo x - percona56-xtradb-cluster/files/patch-mysys_ssl_my_default.cc sed 's/^X//' >percona56-xtradb-cluster/files/patch-mysys_ssl_my_default.cc << '055a85c4d4d5957619c5f7a9cbde5fbc' X--- mysys_ssl/my_default.cc.orig 2013-01-22 17:54:49.000000000 +0100 X+++ mysys_ssl/my_default.cc 2013-02-13 11:08:15.000000000 +0100 X@@ -119,7 +119,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@@ -1395,7 +1395,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@@ -1466,7 +1469,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. 055a85c4d4d5957619c5f7a9cbde5fbc echo x - percona56-xtradb-cluster/files/patch-mysys__posix_timers.c sed 's/^X//' >percona56-xtradb-cluster/files/patch-mysys__posix_timers.c << 'a0fea62112809ba56caea3aa0ed5a4be' X--- mysys/posix_timers.c.orig 2013-10-07 12:25:25.000000000 +0200 X+++ mysys/posix_timers.c 2013-10-07 21:04:37.090622581 +0200 X@@ -22,6 +22,10 @@ X #define sigev_notify_thread_id _sigev_un._tid X #endif X X+#ifdef __FreeBSD__ X+typedef union sigval sigval_t; X+#endif /* __FreeBSD__ */ X+ X #define MY_TIMER_EVENT_SIGNO (SIGRTMIN) X #define MY_TIMER_KILL_SIGNO (SIGRTMIN+1) X X@@ -68,7 +72,18 @@ X sigaddset(&set, MY_TIMER_KILL_SIGNO); X X /* Get the thread ID of the current thread. */ X+ X+#ifdef __FreeBSD__ X+# if __FreeBSD__version > 900030 X+ thread_id= pthread_getthreadid_np(); X+# else X+ long tid; X+ syscall(SYS_thr_self, &tid); X+ thread_id= (pid_t) tid; X+# endif X+#else X thread_id= (pid_t) syscall(SYS_gettid); X+#endif X X /* Wake up parent thread, thread_id is available. */ X pthread_barrier_wait(barrier); a0fea62112809ba56caea3aa0ed5a4be echo x - percona56-xtradb-cluster/files/patch-plugin_password_validation_validate_password.cc sed 's/^X//' >percona56-xtradb-cluster/files/patch-plugin_password_validation_validate_password.cc << 'b7699f8c4105aad1645373c4549dea6e' X--- plugin/password_validation/validate_password.cc.orig 2013-09-10 07:38:25.000000000 +0000 X+++ plugin/password_validation/validate_password.cc 2013-10-05 15:40:20.790380179 +0000 X@@ -16,6 +16,8 @@ X #include <my_sys.h> X #include <string> X #include <mysql/plugin_validate_password.h> X+/* solve clash between libc++ bitset::test() and test macro from my_global.h */ X+#undef test X #include <set> X #include <iostream> X #include <fstream> b7699f8c4105aad1645373c4549dea6e echo x - percona56-xtradb-cluster/files/patch-scripts_CMakeLists.txt sed 's/^X//' >percona56-xtradb-cluster/files/patch-scripts_CMakeLists.txt << '42bcc9a4b5377ddc765a9e8081a1293d' X--- scripts/CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100 X+++ scripts/CMakeLists.txt 2013-02-13 14:39:57.000000000 +0100 X@@ -264,6 +264,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@@ -314,15 +316,10 @@ X # On Unix, most of the files end up in the bin directory X SET(mysql_config_COMPONENT COMPONENT Development) 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@@ -331,7 +328,7 @@ X FOREACH(file ${BIN_SCRIPTS}) X IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) X CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh X- ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY) X+ ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY) X ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}) X CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file} X ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY) 42bcc9a4b5377ddc765a9e8081a1293d echo x - percona56-xtradb-cluster/files/patch-scripts_mysqld_safe.sh sed 's/^X//' >percona56-xtradb-cluster/files/patch-scripts_mysqld_safe.sh << 'cbe60378c5f63ca55afa0d1e485def70' X--- scripts/mysqld_safe.sh.orig 2007-10-08 10:39:23.000000000 +0200 X+++ scripts/mysqld_safe.sh 2007-10-08 10:40:52.000000000 +0200 X@@ -242,10 +242,10 @@ X X if test -z "$MYSQL_HOME" X then X- if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf" X+ if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf" X then X log_error "WARNING: Found two instances of my.cnf - X-$MY_BASEDIR_VERSION/my.cnf and X+$MY_BASEDIR_VERSION/etc/my.cnf and X $DATADIR/my.cnf X IGNORING $DATADIR/my.cnf" X X@@ -254,7 +254,7 @@ X then X log_error "WARNING: Found $DATADIR/my.cnf X The data directory is a deprecated location for my.cnf, please move it to X-$MY_BASEDIR_VERSION/my.cnf" X+$MY_BASEDIR_VERSION/etc/my.cnf" X MYSQL_HOME=$DATADIR X else X MYSQL_HOME=$MY_BASEDIR_VERSION cbe60378c5f63ca55afa0d1e485def70 echo x - percona56-xtradb-cluster/files/patch-scripts_wsrep_sst_xtrabackup-v2.sh sed 's/^X//' >percona56-xtradb-cluster/files/patch-scripts_wsrep_sst_xtrabackup-v2.sh << 'ec924c18980436a6f77a81d182c96554' X--- scripts/wsrep_sst_xtrabackup-v2.sh.orig 2014-04-02 00:19:22.000000000 +0200 X+++ scripts/wsrep_sst_xtrabackup-v2.sh 2014-04-02 00:21:39.000000000 +0200 X@@ -282,7 +282,7 @@ X progress=$(parse_cnf sst progress "") X rebuild=$(parse_cnf sst rebuild 0) X ttime=$(parse_cnf sst time 0) X- cpat=$(parse_cnf sst cpat '.*galera\.cache$\|.*sst_in_progress$\|.*grastate\.dat$\|.*\.err$\|.*\.log$\|.*RPM_UPGRADE_MARKER$\|.*RPM_UPGRADE_HISTORY$') X+ cpat=$(parse_cnf sst cpat '.*galera\.cache$|.*sst_in_progress$|.*grastate\.dat$|.*\.err$|.*\.log$|.*RPM_UPGRADE_MARKER$|.*RPM_UPGRADE_HISTORY$') X incremental=$(parse_cnf sst incremental 0) X ealgo=$(parse_cnf xtrabackup encrypt "") X ekey=$(parse_cnf xtrabackup encrypt-key "") X@@ -330,7 +330,7 @@ X get_proc() X { X set +e X- nproc=$(grep -c processor /proc/cpuinfo) X+ nproc=$(sysctl hw.ncpu|awk -F '[: ]' '{ print $3 }') X [[ -z $nproc || $nproc -eq 0 ]] && nproc=1 X set -e X } X@@ -429,7 +429,7 @@ X local MODULE=$3 X for i in {1..50} X do X- ss -p state listening "( sport = :$PORT )" | grep -qE 'socat|nc' && break X+ sockstat -l -p $PORT -P tcp,udp | grep -qE 'socat|nc' && break X sleep 0.2 X done X if [[ $incremental -eq 1 ]];then X@@ -771,10 +771,10 @@ X if [[ $incremental -ne 1 ]];then X if [[ $speciald -eq 1 ]];then X wsrep_log_info "Cleaning the existing datadir and innodb-data/log directories" X- find $ib_home_dir $ib_log_dir $DATA -mindepth 1 -regex $cpat -prune -o -exec rm -rfv {} 1>&2 \+ X+ find -E $ib_home_dir $ib_log_dir $DATA -mindepth 1 -not -regex $cpat -prune -exec rm -rfv {} 1>&2 \+ X else X wsrep_log_info "Cleaning the existing datadir" X- find $DATA -mindepth 1 -regex $cpat -prune -o -exec rm -rfv {} 1>&2 \+ X+ find -E $DATA -mindepth 1 -not -regex $cpat -prune -exec rm -rfv {} 1>&2 \+ X fi X tempdir=$(parse_cnf mysqld log-bin "") X if [[ -n ${tempdir:-} ]];then ec924c18980436a6f77a81d182c96554 echo x - percona56-xtradb-cluster/files/patch-scripts_wsrep_sst_xtrabackup.sh sed 's/^X//' >percona56-xtradb-cluster/files/patch-scripts_wsrep_sst_xtrabackup.sh << '13f53ee67bf460a79ed9b3e44067bd4d' X--- scripts/wsrep_sst_xtrabackup.sh.orig 2014-04-02 00:11:06.000000000 +0200 X+++ scripts/wsrep_sst_xtrabackup.sh 2014-04-02 00:18:52.000000000 +0200 X@@ -285,7 +285,7 @@ X get_proc() X { X set +e X- nproc=$(grep -c processor /proc/cpuinfo) X+ nproc=$(sysctl hw.ncpu|awk -F '[: ]' '{ print $3 }') X [[ -z $nproc || $nproc -eq 0 ]] && nproc=1 X set -e X } X@@ -371,7 +371,7 @@ X local MODULE=$3 X for i in {1..50} X do X- ss -p state listening "( sport = :$PORT )" | grep -qE 'socat|nc' && break X+ sockstat -l -p $PORT -P tcp,udp | grep -qE 'socat|nc' && break X sleep 0.2 X done X if [[ $incremental -eq 1 ]];then 13f53ee67bf460a79ed9b3e44067bd4d echo x - percona56-xtradb-cluster/files/patch-sql_CMakeLists.txt sed 's/^X//' >percona56-xtradb-cluster/files/patch-sql_CMakeLists.txt << '785ae0d75639e50d0de4a4080cbb29ec' X--- sql/CMakeLists.txt.orig 2013-06-03 00:02:34.000000000 +0200 X+++ sql/CMakeLists.txt 2013-06-06 00:56:54.121744790 +0200 X@@ -430,6 +430,7 @@ X X IF(INSTALL_LAYOUT STREQUAL "STANDALONE") X X+IF(FALSE) X # Copy db.opt into data/test/ X SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt ) X INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles) X@@ -474,6 +475,7 @@ X INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles) X ENDIF() X ENDIF() X+ENDIF() X X ADD_CUSTOM_TARGET(show-dist-name X COMMAND ${CMAKE_COMMAND} -E echo "${CPACK_PACKAGE_FILE_NAME}" 785ae0d75639e50d0de4a4080cbb29ec echo x - percona56-xtradb-cluster/files/patch-sql_sql_trigger.cc sed 's/^X//' >percona56-xtradb-cluster/files/patch-sql_sql_trigger.cc << '3ef9eec8005a834957c8b76061e1f4f9' X--- sql/sql_trigger.cc.orig 2012-08-02 00:01:13.000000000 +0200 X+++ sql/sql_trigger.cc 2012-09-11 17:01:13.000000000 +0200 X@@ -192,32 +192,32 @@ static File_option triggers_file_parameters[]= X { X { X { C_STRING_WITH_LEN("triggers") }, X- my_offsetof(class Table_triggers_list, definitions_list), X+ static_cast<int>(my_offsetof(class Table_triggers_list, definitions_list)), X FILE_OPTIONS_STRLIST X }, X { X { C_STRING_WITH_LEN("sql_modes") }, X- my_offsetof(class Table_triggers_list, definition_modes_list), X+ static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)), X FILE_OPTIONS_ULLLIST X }, X { X { C_STRING_WITH_LEN("definers") }, X- my_offsetof(class Table_triggers_list, definers_list), X+ static_cast<int>(my_offsetof(class Table_triggers_list, definers_list)), X FILE_OPTIONS_STRLIST X }, X { X { C_STRING_WITH_LEN("client_cs_names") }, X- my_offsetof(class Table_triggers_list, client_cs_names), X+ static_cast<int>(my_offsetof(class Table_triggers_list, client_cs_names)), X FILE_OPTIONS_STRLIST X }, X { X { C_STRING_WITH_LEN("connection_cl_names") }, X- my_offsetof(class Table_triggers_list, connection_cl_names), X+ static_cast<int>(my_offsetof(class Table_triggers_list, connection_cl_names)), X FILE_OPTIONS_STRLIST X }, X { X { C_STRING_WITH_LEN("db_cl_names") }, X- my_offsetof(class Table_triggers_list, db_cl_names), X+ static_cast<int>(my_offsetof(class Table_triggers_list, db_cl_names)), X FILE_OPTIONS_STRLIST X }, X { { 0, 0 }, 0, FILE_OPTIONS_STRING } X@@ -226,7 +226,7 @@ static File_option triggers_file_parameters[]= X File_option sql_modes_parameters= X { X { C_STRING_WITH_LEN("sql_modes") }, X- my_offsetof(class Table_triggers_list, definition_modes_list), X+ static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)), X FILE_OPTIONS_ULLLIST X }; X 3ef9eec8005a834957c8b76061e1f4f9 echo x - percona56-xtradb-cluster/files/patch-sql_sql_view.cc sed 's/^X//' >percona56-xtradb-cluster/files/patch-sql_sql_view.cc << '91b9bf07d52aa3f53e0a1feb57118bcb' X--- sql/sql_view.cc.orig 2012-08-02 00:01:13.000000000 +0200 X+++ sql/sql_view.cc 2012-09-11 17:01:13.000000000 +0200 X@@ -730,46 +730,46 @@ static const int required_view_parameters= 14; X */ X static File_option view_parameters[]= X {{{ C_STRING_WITH_LEN("query")}, X- my_offsetof(TABLE_LIST, select_stmt), X+ static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)), X FILE_OPTIONS_ESTRING}, X {{ C_STRING_WITH_LEN("md5")}, X- my_offsetof(TABLE_LIST, md5), X+ static_cast<int>(my_offsetof(TABLE_LIST, md5)), X FILE_OPTIONS_STRING}, X {{ C_STRING_WITH_LEN("updatable")}, X- my_offsetof(TABLE_LIST, updatable_view), X+ static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)), X FILE_OPTIONS_ULONGLONG}, X {{ C_STRING_WITH_LEN("algorithm")}, X- my_offsetof(TABLE_LIST, algorithm), X+ static_cast<int>(my_offsetof(TABLE_LIST, algorithm)), X FILE_OPTIONS_ULONGLONG}, X {{ C_STRING_WITH_LEN("definer_user")}, X- my_offsetof(TABLE_LIST, definer.user), X+ static_cast<int>(my_offsetof(TABLE_LIST, definer.user)), X FILE_OPTIONS_STRING}, X {{ C_STRING_WITH_LEN("definer_host")}, X- my_offsetof(TABLE_LIST, definer.host), X+ static_cast<int>(my_offsetof(TABLE_LIST, definer.host)), X FILE_OPTIONS_STRING}, X {{ C_STRING_WITH_LEN("suid")}, X- my_offsetof(TABLE_LIST, view_suid), X+ static_cast<int>(my_offsetof(TABLE_LIST, view_suid)), X FILE_OPTIONS_ULONGLONG}, X {{ C_STRING_WITH_LEN("with_check_option")}, X- my_offsetof(TABLE_LIST, with_check), X+ static_cast<int>(my_offsetof(TABLE_LIST, with_check)), X FILE_OPTIONS_ULONGLONG}, X {{ C_STRING_WITH_LEN("timestamp")}, X- my_offsetof(TABLE_LIST, timestamp), X+ static_cast<int>(my_offsetof(TABLE_LIST, timestamp)), X FILE_OPTIONS_TIMESTAMP}, X {{ C_STRING_WITH_LEN("create-version")}, X- my_offsetof(TABLE_LIST, file_version), X+ static_cast<int>(my_offsetof(TABLE_LIST, file_version)), X FILE_OPTIONS_ULONGLONG}, X {{ C_STRING_WITH_LEN("source")}, X- my_offsetof(TABLE_LIST, source), X+ static_cast<int>(my_offsetof(TABLE_LIST, source)), X FILE_OPTIONS_ESTRING}, X {{(char*) STRING_WITH_LEN("client_cs_name")}, X- my_offsetof(TABLE_LIST, view_client_cs_name), X+ static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)), X FILE_OPTIONS_STRING}, X {{(char*) STRING_WITH_LEN("connection_cl_name")}, X- my_offsetof(TABLE_LIST, view_connection_cl_name), X+ static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)), X FILE_OPTIONS_STRING}, X {{(char*) STRING_WITH_LEN("view_body_utf8")}, X- my_offsetof(TABLE_LIST, view_body_utf8), X+ static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)), X FILE_OPTIONS_ESTRING}, X {{NullS, 0}, 0, X FILE_OPTIONS_STRING} 91b9bf07d52aa3f53e0a1feb57118bcb echo x - percona56-xtradb-cluster/files/patch-sql_sys_vars.cc sed 's/^X//' >percona56-xtradb-cluster/files/patch-sql_sys_vars.cc << '72a6c0d9ce14a3c9275e80321bcf0ca5' X--- sql/sys_vars.cc.orig 2012-06-15 17:03:32.000000000 +0200 X+++ sql/sys_vars.cc 2012-06-15 17:16:23.000000000 +0200 X@@ -900,7 +900,7 @@ X "connection before closing it", X SESSION_VAR(net_interactive_timeout), X CMD_LINE(REQUIRED_ARG), X- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); X+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); X X static Sys_var_ulong Sys_join_buffer_size( X "join_buffer_size", X@@ -1401,7 +1401,7 @@ X "Number of seconds to wait for more data from a connection before " X "aborting the read", X SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG), X- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), X+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), X NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), X ON_UPDATE(fix_net_read_timeout)); X X@@ -1416,7 +1416,7 @@ X "Number of seconds to wait for a block to be written to a connection " X "before aborting the write", X SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG), X- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), X+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), X NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), X ON_UPDATE(fix_net_write_timeout)); X X@@ -2257,7 +2257,7 @@ X "The number of seconds the server waits for activity on a " X "connection before closing it", X SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG), X- VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)), X+ VALID_RANGE(1, INT_MAX32/1000), X DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); X X /** propagates changes to the relevant flag of @@optimizer_switch */ 72a6c0d9ce14a3c9275e80321bcf0ca5 echo x - percona56-xtradb-cluster/files/patch-support-files_CMakeLists.txt sed 's/^X//' >percona56-xtradb-cluster/files/patch-support-files_CMakeLists.txt << '029708a56e55e3352f75e4bdee2fd2b8' X--- support-files/CMakeLists.txt.orig 2010-12-23 17:38:19.000000000 +0100 X+++ support-files/CMakeLists.txt 2010-12-23 17:41:11.000000000 +0100 X@@ -74,7 +74,9 @@ X INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) X ENDIF() X X+IF(FALSE) X INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) X+ENDIF() 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 CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.${VERSION}.spec @ONLY) 029708a56e55e3352f75e4bdee2fd2b8 exit >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405021657.s42GvGgX088024>