FreeBSD Bugzilla – Attachment 177353 Details for
Bug 214807
New port: databases/mysql-wsrep56-server: MySQL version enabled for Galera Replication
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
.shar file for mysql-wsrep56-server port
mysql-wsrep56-server.shar (text/plain), 36.04 KB, created by
Philip Stoev
on 2016-11-24 13:04:43 UTC
(
hide
)
Description:
.shar file for mysql-wsrep56-server port
Filename:
MIME Type:
Creator:
Philip Stoev
Created:
2016-11-24 13:04:43 UTC
Size:
36.04 KB
patch
obsolete
># 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: ># ># mysql-wsrep56-server ># mysql-wsrep56-server/pkg-plist ># mysql-wsrep56-server/pkg-message ># mysql-wsrep56-server/pkg-descr ># mysql-wsrep56-server/distinfo ># mysql-wsrep56-server/Makefile ># mysql-wsrep56-server/files ># mysql-wsrep56-server/files/patch-support-files_CMakeLists.txt ># mysql-wsrep56-server/files/mysql-server.in ># mysql-wsrep56-server/files/patch-CMakeLists.txt ># mysql-wsrep56-server/files/patch-client_CMakeLists.txt ># mysql-wsrep56-server/files/patch-cmake_plugin.cmake ># mysql-wsrep56-server/files/patch-extra_CMakeLists.txt ># mysql-wsrep56-server/files/patch-include_CMakeLists.txt ># mysql-wsrep56-server/files/patch-include_my_compare.h ># mysql-wsrep56-server/files/patch-include_myisam.h ># mysql-wsrep56-server/files/patch-libmysql_CMakeLists.txt ># mysql-wsrep56-server/files/patch-libservices_CMakeLists.txt ># mysql-wsrep56-server/files/patch-man_CMakeLists.txt ># mysql-wsrep56-server/files/patch-mysys_ssl_my_default.cc ># mysql-wsrep56-server/files/patch-plugin_password_validation_validate_password.cc ># mysql-wsrep56-server/files/patch-scripts_CMakeLists.txt ># mysql-wsrep56-server/files/patch-scripts_mysqld_safe.sh ># mysql-wsrep56-server/files/patch-sql_CMakeLists.txt ># mysql-wsrep56-server/files/patch-sql_sql_trigger.cc ># mysql-wsrep56-server/files/patch-sql_sql_view.cc ># mysql-wsrep56-server/files/patch-sql_sys_vars.cc ># mysql-wsrep56-server/files/extra-patch-config.h.cmake ># mysql-wsrep56-server/pkg-comment ># >echo c - mysql-wsrep56-server >mkdir -p mysql-wsrep56-server > /dev/null 2>&1 >echo x - mysql-wsrep56-server/pkg-plist >sed 's/^X//' >mysql-wsrep56-server/pkg-plist << 'bba315128808a06d11be935be1588b87' >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/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/mysql_no_login.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/test_udf_services.so >Xlib/mysql/plugin/validate_password.so >Xlib/mysql/plugin/innodb_engine.so >Xlib/mysql/plugin/libmemcached.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 >Xshare/mysql/wsrep_notify >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 >bba315128808a06d11be935be1588b87 >echo x - mysql-wsrep56-server/pkg-message >sed 's/^X//' >mysql-wsrep56-server/pkg-message << '8a0c9d1e5cc8f928df3f85b6270525dc' >X************************************************************************ >X >XRemember to run mysql_upgrade the first time you start the MySQL server >Xafter an upgrade from an earlier version. >X >X************************************************************************ >8a0c9d1e5cc8f928df3f85b6270525dc >echo x - mysql-wsrep56-server/pkg-descr >sed 's/^X//' >mysql-wsrep56-server/pkg-descr << '2356c5db2fa9a2058ffca50cffbb1408' >XMySQL is a very fast, multi-threaded, multi-user and robust SQL >X(Structured Query Language) database server. >X >XWWW: http://www.mysql.com/ >X >XBuilt with wsrep patch to support replication using the Galera library. >X >XWWW: http://www.galeracluster.com/ >2356c5db2fa9a2058ffca50cffbb1408 >echo x - mysql-wsrep56-server/distinfo >sed 's/^X//' >mysql-wsrep56-server/distinfo << '5dc074401a757ebfb8dfe9e17de238b9' >XTIMESTAMP = 1477038469 >XSHA256 (mysql-wsrep-5.6.34-25.18.tar.gz) = 369785e629eb9bef51752ee71ec6be3bef36001b05f80d697b927ccb9fad0b87 >XSIZE (mysql-wsrep-5.6.34-25.18.tar.gz) = 33131547 >5dc074401a757ebfb8dfe9e17de238b9 >echo x - mysql-wsrep56-server/Makefile >sed 's/^X//' >mysql-wsrep56-server/Makefile << '74d37de9dc73bfaf58f851983685b20f' >XPORTNAME?= mysql-wsrep >XPORTVERSION= 5.6.34 >XPORTREVISION?= 0 >XCATEGORIES= databases ipv6 >XMASTER_SITES= http://releases.galeracluster.com/source/ >XDISTFILES= mysql-wsrep-5.6.34-25.18.tar.gz >XDISTNAME= mysql-wsrep-5.6.34-25.18 >XPKGNAMESUFFIX?= 56-server >XDATADIR= ${PREFIX}/share/mysql >X >XMAINTAINER= info@galeracluster.com >XCOMMENT?= A version of MySQL modified for Galera replication (server package) >X >XBROKEN_powerpc64= Does not build >X >XSLAVEDIRS= databases/mysql56-client >XUSES= cmake shebangfix >X >XRUN_DEPENDS= socat:net/socat lsof:sysutils/lsof netcat:net/netcat rsync:net/rsync >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 -DWITH_WSREP=1 >X >XSHEBANG_FILES= scripts/*.pl* scripts/*.sh scripts/wsrep_sst_* >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# MySQL-Server part >X.if !defined(CLIENT_ONLY) >XUSE_MYSQL= yes >XWANT_MYSQL_VER= 56 >X >XUSES+= perl5 >XUSE_PERL5= run >X >XCONFLICTS_INSTALL= mysql5[0-57-9]-server-* \ >X mariadb*-server-* \ >X percona*-server-* >X >XUSE_RC_SUBR= mysql-server >X >XUSERS= mysql >XGROUPS= mysql >X >XMMAN1= 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 >X.else >XUSES+= libedit >X.endif >X >Xpost-patch: >X @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt >X >X.include <bsd.port.pre.mk> >X >X.if ${ARCH} == "armv6" >XEXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake >X.endif >X >X.include <bsd.port.post.mk> >74d37de9dc73bfaf58f851983685b20f >echo c - mysql-wsrep56-server/files >mkdir -p mysql-wsrep56-server/files > /dev/null 2>&1 >echo x - mysql-wsrep56-server/files/patch-support-files_CMakeLists.txt >sed 's/^X//' >mysql-wsrep56-server/files/patch-support-files_CMakeLists.txt << 'd8ad930bb729afc1129836e8d385ce9c' >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) >d8ad930bb729afc1129836e8d385ce9c >echo x - mysql-wsrep56-server/files/mysql-server.in >sed 's/^X//' >mysql-wsrep56-server/files/mysql-server.in << '659ce6c752abb5411e6527f30dac630f' >X#!/bin/sh >X# >X# $FreeBSD: head/databases/mysql56-server/files/mysql-server.in 340872 2014-01-24 00:14:07Z mat $ >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%% --defaults-extra-file=${mysql_optfile} --datadir=${mysql_dbdir} --force" >Xservice_startup_timeout=900 >Xstartup_sleep=1 >Xsst_progress_file=${mysql_dbdir}/sst_in_progress >Xextra_commands="bootstrap" >Xbootstrap_cmd="mysql_bootstrap" >Xfor gcc in gcc44 gcc48 >Xdo >X gcc_dir=/usr/local/lib/${gcc} >X [ -d "${gcc_dir}" ] && export LD_LIBRARY_PATH="${gcc_dir}:$LD_LIBRARY_PATH" >Xdone >X >Xmysql_bootstrap() >X{ >X # Bootstrap the cluster, start the first node that initiate the cluster >X check_startmsgs && echo "Bootstrapping cluster" >X shift >X $0 onestart $rc_extra_args --wsrep-new-cluster >X} >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 [ ! -d "${mysql_dbdir}/mysql/." ]; then >X mysql_create_auth_tables || return 1 >X fi >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=${service_startup_timeout} >X while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do >X if test -e $sst_progress_file && [ $startup_sleep -ne 100 ]; then >X check_startmsgs && echo "SST in progress, setting sleep higher" >X startup_sleep=100 >X fi >X timeout=$(( timeout - 1 )) >X sleep $startup_sleep >X done >X return 0 >X} >X >Xrun_rc_command "$1" >659ce6c752abb5411e6527f30dac630f >echo x - mysql-wsrep56-server/files/patch-CMakeLists.txt >sed 's/^X//' >mysql-wsrep56-server/files/patch-CMakeLists.txt << '53c85cba9f75a9bc50b73d49bf520cec' >X--- CMakeLists.txt.orig 2014-07-18 15:48:39.000000000 +0000 >X+++ CMakeLists.txt 2014-08-04 14:18:38.795491147 +0000 >X@@ -500,12 +500,10 @@ >X ENDIF() >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 ENDIF() >X >X@@ -514,10 +512,7 @@ >X ADD_SUBDIRECTORY(scripts) >X >X IF(NOT WITHOUT_SERVER) >X- ADD_SUBDIRECTORY(mysql-test) >X- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) >X ADD_SUBDIRECTORY(support-files) >X- ADD_SUBDIRECTORY(sql-bench) >X IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) >X ADD_SUBDIRECTORY(internal) >X ENDIF() >X@@ -572,6 +567,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@@ -597,5 +593,6 @@ >X PATTERN "sp-imp-spec.txt" EXCLUDE >X ) >X ENDIF() >X+ENDIF() >X >X INCLUDE(CPack) >53c85cba9f75a9bc50b73d49bf520cec >echo x - mysql-wsrep56-server/files/patch-client_CMakeLists.txt >sed 's/^X//' >mysql-wsrep56-server/files/patch-client_CMakeLists.txt << '5311f9393bb8a1fe27f74ec5634c8878' >X--- client/CMakeLists.txt.orig 2013-05-21 17:18:39.000000000 +0200 >X+++ client/CMakeLists.txt 2013-06-10 15:43:33.000000000 +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) >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) >5311f9393bb8a1fe27f74ec5634c8878 >echo x - mysql-wsrep56-server/files/patch-cmake_plugin.cmake >sed 's/^X//' >mysql-wsrep56-server/files/patch-cmake_plugin.cmake << '76e192a1ebeb6ae78ce9846f455039b2' >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" >76e192a1ebeb6ae78ce9846f455039b2 >echo x - mysql-wsrep56-server/files/patch-extra_CMakeLists.txt >sed 's/^X//' >mysql-wsrep56-server/files/patch-extra_CMakeLists.txt << 'd6c749daf2322729aa6f486c8e13dd66' >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 >d6c749daf2322729aa6f486c8e13dd66 >echo x - mysql-wsrep56-server/files/patch-include_CMakeLists.txt >sed 's/^X//' >mysql-wsrep56-server/files/patch-include_CMakeLists.txt << 'e65889072b4c5309c2978c9d98b3256b' >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 >e65889072b4c5309c2978c9d98b3256b >echo x - mysql-wsrep56-server/files/patch-include_my_compare.h >sed 's/^X//' >mysql-wsrep56-server/files/patch-include_my_compare.h << '2f8b6bdd72545da7df733387d672fba2' >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) >2f8b6bdd72545da7df733387d672fba2 >echo x - mysql-wsrep56-server/files/patch-include_myisam.h >sed 's/^X//' >mysql-wsrep56-server/files/patch-include_myisam.h << 'aef3720e2382dd2eaef25c3513c79109' >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) >aef3720e2382dd2eaef25c3513c79109 >echo x - mysql-wsrep56-server/files/patch-libmysql_CMakeLists.txt >sed 's/^X//' >mysql-wsrep56-server/files/patch-libmysql_CMakeLists.txt << '948e2e8fac1d5dba7300f6182eb9d3a1' >X--- libmysql/CMakeLists.txt.orig 2013-07-10 18:17:29.000000000 +0200 >X+++ libmysql/CMakeLists.txt 2013-08-12 08:59:49.000000000 +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@@ -200,19 +200,22 @@ >X ENDMACRO() >X ENDIF() >X >X+IF(FALSE) >X IF(UNIX) >X GET_TARGET_NAME(mysqlclient lib_name) >X INSTALL_SYMLINK(mysqlclient >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@@ -271,4 +274,5 @@ >X ${INSTALL_LIBDIR} SharedLibraries) >X ENDFOREACH() >X ENDIF() >X+ ENDIF() >X ENDIF() >948e2e8fac1d5dba7300f6182eb9d3a1 >echo x - mysql-wsrep56-server/files/patch-libservices_CMakeLists.txt >sed 's/^X//' >mysql-wsrep56-server/files/patch-libservices_CMakeLists.txt << '94bc47bf03b66492f39c567be1abf54e' >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() >94bc47bf03b66492f39c567be1abf54e >echo x - mysql-wsrep56-server/files/patch-man_CMakeLists.txt >sed 's/^X//' >mysql-wsrep56-server/files/patch-man_CMakeLists.txt << '6f8168b55bfcd86cf6d9a4f8cce74bfa' >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) >6f8168b55bfcd86cf6d9a4f8cce74bfa >echo x - mysql-wsrep56-server/files/patch-mysys_ssl_my_default.cc >sed 's/^X//' >mysql-wsrep56-server/files/patch-mysys_ssl_my_default.cc << '3cb4fa4f83f26f1dbbd3940baf974371' >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. >3cb4fa4f83f26f1dbbd3940baf974371 >echo x - mysql-wsrep56-server/files/patch-plugin_password_validation_validate_password.cc >sed 's/^X//' >mysql-wsrep56-server/files/patch-plugin_password_validation_validate_password.cc << '4950ac1fd7df92233505c6d63edd894b' >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> >4950ac1fd7df92233505c6d63edd894b >echo x - mysql-wsrep56-server/files/patch-scripts_CMakeLists.txt >sed 's/^X//' >mysql-wsrep56-server/files/patch-scripts_CMakeLists.txt << 'ef510efdafd88bbd59f235fbcecbe908' >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) >ef510efdafd88bbd59f235fbcecbe908 >echo x - mysql-wsrep56-server/files/patch-scripts_mysqld_safe.sh >sed 's/^X//' >mysql-wsrep56-server/files/patch-scripts_mysqld_safe.sh << 'ce1f4b252b0e31030fe92c02e8e40df5' >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 >ce1f4b252b0e31030fe92c02e8e40df5 >echo x - mysql-wsrep56-server/files/patch-sql_CMakeLists.txt >sed 's/^X//' >mysql-wsrep56-server/files/patch-sql_CMakeLists.txt << 'fc489ac6ddd8780f0e4f8260c840deda' >X--- sql/CMakeLists.txt.orig 2013-04-05 14:27:18.000000000 +0200 >X+++ sql/CMakeLists.txt 2013-04-19 15:08:12.000000000 +0200 >X@@ -423,6 +423,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@@ -467,6 +468,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}" >fc489ac6ddd8780f0e4f8260c840deda >echo x - mysql-wsrep56-server/files/patch-sql_sql_trigger.cc >sed 's/^X//' >mysql-wsrep56-server/files/patch-sql_sql_trigger.cc << '2d439ad5a1233eb04d5e7bde06c51a9d' >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 >2d439ad5a1233eb04d5e7bde06c51a9d >echo x - mysql-wsrep56-server/files/patch-sql_sql_view.cc >sed 's/^X//' >mysql-wsrep56-server/files/patch-sql_sql_view.cc << '68f2687e309e43fcc5eaf611f6474b56' >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} >68f2687e309e43fcc5eaf611f6474b56 >echo x - mysql-wsrep56-server/files/patch-sql_sys_vars.cc >sed 's/^X//' >mysql-wsrep56-server/files/patch-sql_sys_vars.cc << '51b37d35c3dd630e0e93a0e546274a8c' >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 */ >51b37d35c3dd630e0e93a0e546274a8c >echo x - mysql-wsrep56-server/files/extra-patch-config.h.cmake >sed 's/^X//' >mysql-wsrep56-server/files/extra-patch-config.h.cmake << 'e5c34b851f64afa5fe302ef812577946' >X--- config.h.cmake.orig 2014-12-05 16:24:02 UTC >X+++ config.h.cmake >X@@ -151,7 +151,8 @@ >X #cmakedefine HAVE_FESETROUND 1 >X #cmakedefine HAVE_FINITE 1 >X #cmakedefine HAVE_FP_EXCEPT 1 >X-#cmakedefine HAVE_FPSETMASK 1 >X+#cmakedefine HAVE_FPSETMASK 0 >X+#cmakedefine HAVE_FEDISABLEEXCEPT 1 >X #cmakedefine HAVE_FSEEKO 1 >X #cmakedefine HAVE_FSYNC 1 >X #cmakedefine HAVE_FTIME 1 >e5c34b851f64afa5fe302ef812577946 >echo x - mysql-wsrep56-server/pkg-comment >sed 's/^X//' >mysql-wsrep56-server/pkg-comment << 'a4f6361853e8e34c48b9ddb3819d0afc' >XA version of MySQL modified for Galera replication (server package) >a4f6361853e8e34c48b9ddb3819d0afc >exit >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 214807
:
177353
|
179521