Attachment 163207 Details for Bug 204607 – mysql57-server shar file (it has porting issue!)

mysql57-server shar file (it has porting issue!)

mysql57-server.shar (text/plain), 42.18 KB, created by Mahdi Mokhtari on 2015-11-16 19:23:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mahdi Mokhtari

Created: 2015-11-16 19:23:02 UTC

Size: 42.18 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:
>#
>#	mysql57-server/
>#	mysql57-server/distinfo
>#	mysql57-server/pkg-message
>#	mysql57-server/Makefile
>#	mysql57-server/pkg-plist
>#	mysql57-server/pkg-descr
>#	mysql57-server/files
>#	mysql57-server/files/patch-sql_conn_handler_socket_connection.cc
>#	mysql57-server/files/mysql-server.in
>#	mysql57-server/patch-config.h.cmake
>#	mysql57-server/patch-sql_conn_handler_socket_connection.cc
>#	mysql57-server/my_dir_files
>#	mysql57-server/my_dir_files/patch-scripts_CMakeLists.txt
>#	mysql57-server/my_dir_files/patch-plugin_password_validation_validate_password.cc
>#	mysql57-server/my_dir_files/patch-CMakeLists.txt
>#	mysql57-server/my_dir_files/patch-support-files_CMakeLists.txt
>#	mysql57-server/my_dir_files/patch-cmake_plugin.cmake
>#	mysql57-server/my_dir_files/patch-include_CMakeLists.txt
>#	mysql57-server/my_dir_files/mysql-server.in
>#	mysql57-server/my_dir_files/patch-include_my_compare.h
>#	mysql57-server/my_dir_files/patch-man_CMakeLists.txt
>#	mysql57-server/my_dir_files/patch-mysys_ssl_my_default.cc
>#	mysql57-server/my_dir_files/patch-sql_sql_view.cc
>#	mysql57-server/my_dir_files/patch-sql_sys_vars.cc
>#	mysql57-server/my_dir_files/patch-extra_CMakeLists.txt
>#	mysql57-server/my_dir_files/patch-libservices_CMakeLists.txt
>#	mysql57-server/my_dir_files/patch-libmysql_CMakeLists.txt
>#	mysql57-server/my_dir_files/patch-client_CMakeLists.txt
>#	mysql57-server/my_dir_files/patch-include_myisam.h
>#	mysql57-server/my_dir_files/patch-sql_conn_handler_socket_connection.cc
>#	mysql57-server/patch-CMakeLists.txt
>#	mysql57-server/patch-sql_sql_class.h
>#	mysql57-server/patch-include_my_global.h
>#
>echo c - mysql57-server/
>mkdir -p mysql57-server/ > /dev/null 2>&1
>echo x - mysql57-server/distinfo
>sed 's/^X//' >mysql57-server/distinfo << '6070066c965dccc059a574e8fad21667'
>XSHA256 (mysql-5.7.8-rc.tar.gz) = 9da4bff6e0840d260b2fef2dac0138e6f0fa05f2a95cf3f6cb1014a0fd46269b
>XSIZE (mysql-5.7.8-rc.tar.gz) = 49762480
>6070066c965dccc059a574e8fad21667
>echo x - mysql57-server/pkg-message
>sed 's/^X//' >mysql57-server/pkg-message << '311385c085f25c623b53423125eb18ce'
>X************************************************************************
>X
>XRemember to run mysql_upgrade the first time you start the MySQL server
>Xafter an upgrade from an earlier version.
>X
>X************************************************************************
>311385c085f25c623b53423125eb18ce
>echo x - mysql57-server/Makefile
>sed 's/^X//' >mysql57-server/Makefile << '0c2c532865b7697a2c9f2405335243aa'
>X# Created by: "Mahdi Mokhtari <mokhi64@gmail.com>"
>X# $FreeBSD$
>X
>XPORTNAME?=	mysql
>XPORTVERSION=	5.7.8
>XDISTVERSIONSUFFIX?=     -rc
>XPORTREVISION?=	0
>XCATEGORIES=	databases ipv6
>XMASTER_SITES=	${MASTER_SITE_MYSQL}
>XMASTER_SITE_SUBDIR=	MySQL-5.7
>XPKGNAMESUFFIX?=	57-server
>X
>XMAINTAINER=	mokhi64@gmail.com
>XCOMMENT?=	Multithreaded SQL database (server)
>X
>XSLAVEDIRS=	databases/mysql57-client
>XRUN_DEPENDS=	libboost_atomic.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XRUN_DEPENDS=	libboost_chrono.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XRUN_DEPENDS=	libboost_context.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XRUN_DEPENDS=	libboost_coroutine.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XRUN_DEPENDS=	libboost_date_time.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XRUN_DEPENDS=	libboost_filesystem.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XRUN_DEPENDS=	libboost_graph.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XRUN_DEPENDS=	libboost_iostreams.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XRUN_DEPENDS=	libboost_locale.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XRUN_DEPENDS=	libboost_log.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XRUN_DEPENDS=	libboost_log_setup.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XRUN_DEPENDS=	libboost_math_c99.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XRUN_DEPENDS=	libboost_math_c99f.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XRUN_DEPENDS=	libboost_math_tr1.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XRUN_DEPENDS=	libboost_math_tr1f.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XRUN_DEPENDS=	libboost_prg_exec_monitor.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XRUN_DEPENDS=	libboost_program_options.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XRUN_DEPENDS=	libboost_python.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XRUN_DEPENDS=	libboost_random.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XRUN_DEPENDS=	libboost_regex.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XRUN_DEPENDS=	libboost_serialization.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XRUN_DEPENDS=	libboost_signals.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XRUN_DEPENDS=	libboost_system.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XRUN_DEPENDS=	libboost_thread.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XRUN_DEPENDS=	libboost_timer.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XRUN_DEPENDS=	libboost_unit_test_framework.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XRUN_DEPENDS=	libboost_wave.so.1.58.0:${PORTSDIR}/devel/boost-libs
>X#RUN_DEPENDS=    libboost_wserialization.so.1.58.0:${PORTSDIR}/devel/boost-libs
>XUSES=		cmake:outsource shebangfix
>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_SUPPORTFILESDIR="share/mysql"
>X#		-DINSTALL_SQLBENCHDIR="share/mysql" \
>X#		-DWITH_EDITLINE=system \
>X#		-DWITH_LIBWRAP=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# MySQL-Server part
>X.if !defined(CLIENT_ONLY)
>XUSE_MYSQL=	yes
>XWANT_MYSQL_VER=	57
>XWITH_MYSQL_VER=	57
>X
>XUSES+=		perl5
>XUSE_PERL5=	run
>X
>XCONFLICTS_INSTALL=	mysql5.[0-57-9]-server-* mysql[0-46-9][0-9]-server-* percona[0-9][0-9]-server-* mariadb[0-9][0-9]-server-*
>X
>XUSE_RC_SUBR=	mysql-server
>X
>XUSERS=		mysql
>XGROUPS=		mysql
>X
>XMAN1=		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#CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
>X.else
>XUSES+=		readline
>X.endif
>X
>X##post-configure:
>X##	cp -r ${WRKSRC}/include/* ${WRKSRC}/../.build/include
>X##	cp -r ${WRKSRC}/sql/* ${WRKSRC}/../.build/sql
>X##
>Xpost-patch:
>X	@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
>X
>X.include <bsd.port.mk>
>0c2c532865b7697a2c9f2405335243aa
>echo x - mysql57-server/pkg-plist
>sed 's/^X//' >mysql57-server/pkg-plist << 'c720504b3bbaf7844ffeba66fa0acd55'
>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
>Xlib/mysql/libmysqld.a
>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
>c720504b3bbaf7844ffeba66fa0acd55
>echo x - mysql57-server/pkg-descr
>sed 's/^X//' >mysql57-server/pkg-descr << 'bed4d9dc3150521c5ff77793a958fd26'
>XMySQL is a very fast, multi-threaded, multi-user and robust SQL
>X(Structured Query Language) database server.
>X
>XWWW: http://www.mysql.com/
>bed4d9dc3150521c5ff77793a958fd26
>echo c - mysql57-server/files
>mkdir -p mysql57-server/files > /dev/null 2>&1
>echo x - mysql57-server/files/patch-sql_conn_handler_socket_connection.cc
>sed 's/^X//' >mysql57-server/files/patch-sql_conn_handler_socket_connection.cc << 'cad5ff0105328a2a41038e2a6aa5913e'
>X--- sql/conn_handler/socket_connection.cc.orig	2015-07-20 16:55:10.000000000 +0430
>X+++ sql/conn_handler/socket_connection.cc	2015-11-14 20:53:36.000000000 +0330
>X@@ -939,20 +939,23 @@
>X     signal(SIGCHLD, SIG_DFL);
>X     request_init(&req, RQ_DAEMON, m_libwrap_name, RQ_FILE,
>X                  mysql_socket_getfd(connect_sock), NULL);
>X-    fromhost(&req);
>X+    void (*my_fromhost) (void *) = (void (*)(void *)) fromhost;
>X+    my_fromhost(&req);
>X 
>X-    if (!hosts_access(&req))
>X+    int (*my_hosts_access) (void *) = (int (*) (void *)) hosts_access;
>X+    if (!my_hosts_access(&req))
>X     {
>X       /*
>X         This may be stupid but refuse() includes an exit(0)
>X         which we surely don't want...
>X         clean_exit() - same stupid thing ...
>X       */
>X+      char *(*my_eval_client) (void *) = (char *(*) (void *)) eval_client;
>X       syslog(LOG_AUTH | m_deny_severity,
>X-             "refused connect from %s", eval_client(&req));
>X+             "refused connect from %s", my_eval_client(&req));
>X 
>X       if (req.sink)
>X-        (req.sink)(req.fd);
>X+        ((void (*)(int)) (req.sink))(req.fd);
>X 
>X       mysql_socket_shutdown(listen_sock, SHUT_RDWR);
>X       mysql_socket_close(listen_sock);
>cad5ff0105328a2a41038e2a6aa5913e
>echo x - mysql57-server/files/mysql-server.in
>sed 's/^X//' >mysql57-server/files/mysql-server.in << '02e7fcb834082cb3f0bf422cdf48118a'
>X#!/bin/sh
>X#
>X# $FreeBSD: tags/RELEASE_10_1_0/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"
>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=15
>X	while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
>X		timeout=$(( timeout - 1 ))
>X		sleep 1
>X	done
>X	return 0
>X}
>X
>Xrun_rc_command "$1"
>02e7fcb834082cb3f0bf422cdf48118a
>echo x - mysql57-server/patch-config.h.cmake
>sed 's/^X//' >mysql57-server/patch-config.h.cmake << '51d0c2428cb787766c07bcc6cd2d5279'
>X--- config.h.cmake.orig	2015-11-14 17:13:28.000000000 +0330
>X+++ config.h.cmake	2015-11-14 17:13:43.000000000 +0330
>X@@ -29,7 +29,6 @@
>X #cmakedefine HAVE_LIBSOCKET 1
>X #cmakedefine HAVE_LIBDL 1
>X #cmakedefine HAVE_LIBRT 1
>X-#cmakedefine HAVE_LIBWRAP 1
>X 
>X /* Header files */
>X #cmakedefine HAVE_ALLOCA_H 1
>51d0c2428cb787766c07bcc6cd2d5279
>echo x - mysql57-server/patch-sql_conn_handler_socket_connection.cc
>sed 's/^X//' >mysql57-server/patch-sql_conn_handler_socket_connection.cc << '8967d0bed930988cb1fb74bb1ee0a3ed'
>X--- sql/conn_handler/socket_connection.cc.orig	2015-07-20 16:55:10.000000000 +0430
>X+++ sql/conn_handler/socket_connection.cc	2015-11-14 20:53:36.000000000 +0330
>X@@ -939,20 +939,23 @@
>X     signal(SIGCHLD, SIG_DFL);
>X     request_init(&req, RQ_DAEMON, m_libwrap_name, RQ_FILE,
>X                  mysql_socket_getfd(connect_sock), NULL);
>X-    fromhost(&req);
>X+    void (*my_fromhost) (void *) = (void (*)(void *)) fromhost;
>X+    my_fromhost(&req);
>X 
>X-    if (!hosts_access(&req))
>X+    int (*my_hosts_access) (void *) = (int (*) (void *)) hosts_access;
>X+    if (!my_hosts_access(&req))
>X     {
>X       /*
>X         This may be stupid but refuse() includes an exit(0)
>X         which we surely don't want...
>X         clean_exit() - same stupid thing ...
>X       */
>X+      char *(*my_eval_client) (void *) = (char *(*) (void *)) eval_client;
>X       syslog(LOG_AUTH | m_deny_severity,
>X-             "refused connect from %s", eval_client(&req));
>X+             "refused connect from %s", my_eval_client(&req));
>X 
>X       if (req.sink)
>X-        (req.sink)(req.fd);
>X+        ((void (*)(int)) (req.sink))(req.fd);
>X 
>X       mysql_socket_shutdown(listen_sock, SHUT_RDWR);
>X       mysql_socket_close(listen_sock);
>8967d0bed930988cb1fb74bb1ee0a3ed
>echo c - mysql57-server/my_dir_files
>mkdir -p mysql57-server/my_dir_files > /dev/null 2>&1
>echo x - mysql57-server/my_dir_files/patch-scripts_CMakeLists.txt
>sed 's/^X//' >mysql57-server/my_dir_files/patch-scripts_CMakeLists.txt << '511bd83f1bbc014c871e305a5bb6bbc8'
>X--- scripts/CMakeLists.txt.orig	2015-07-20 16:55:08.000000000 +0430
>X+++ scripts/CMakeLists.txt	2015-11-14 15:19:03.000000000 +0330
>X@@ -349,6 +349,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@@ -408,12 +410,10 @@
>X 
>X   IF(WITH_SYSTEMD)
>X     SET(BIN_SCRIPTS
>X-      mysql_config
>X       mysqldumpslow
>X       )
>X   ELSE()
>X     SET(BIN_SCRIPTS
>X-      mysql_config
>X       mysqldumpslow
>X       mysqld_multi
>X       mysqld_safe
>X@@ -423,7 +423,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)
>511bd83f1bbc014c871e305a5bb6bbc8
>echo x - mysql57-server/my_dir_files/patch-plugin_password_validation_validate_password.cc
>sed 's/^X//' >mysql57-server/my_dir_files/patch-plugin_password_validation_validate_password.cc << 'a2fa8894ae04fbae359306c0014e7efb'
>X--- plugin/password_validation/validate_password.cc.orig	2015-07-20 16:55:08.000000000 +0430
>X+++ plugin/password_validation/validate_password.cc	2015-11-14 15:14:39.000000000 +0330
>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 <mysql/service_my_plugin_log.h>
>X #include <mysql/service_mysql_string.h>
>X #include <set>
>a2fa8894ae04fbae359306c0014e7efb
>echo x - mysql57-server/my_dir_files/patch-CMakeLists.txt
>sed 's/^X//' >mysql57-server/my_dir_files/patch-CMakeLists.txt << '0b4bfcffab41dd03bf4b1a80954d7b19'
>X--- CMakeLists.txt.orig	2015-07-20 16:55:08.000000000 +0430
>X+++ CMakeLists.txt	2015-11-14 14:41:31.000000000 +0330
>X@@ -524,12 +524,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@@ -538,8 +536,6 @@
>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   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
>X     ADD_SUBDIRECTORY(internal)
>X@@ -594,6 +590,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@@ -620,6 +617,7 @@
>X     PATTERN "sp-imp-spec.txt" EXCLUDE
>X   )
>X ENDIF()
>X+ENDIF()
>X 
>X INCLUDE(CPack)
>X 
>0b4bfcffab41dd03bf4b1a80954d7b19
>echo x - mysql57-server/my_dir_files/patch-support-files_CMakeLists.txt
>sed 's/^X//' >mysql57-server/my_dir_files/patch-support-files_CMakeLists.txt << '97362e55d34db7cc993d23364e618e2e'
>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)
>97362e55d34db7cc993d23364e618e2e
>echo x - mysql57-server/my_dir_files/patch-cmake_plugin.cmake
>sed 's/^X//' >mysql57-server/my_dir_files/patch-cmake_plugin.cmake << '9a4b71b75db22a8259e96ec7af0348e3'
>X--- cmake/plugin.cmake.orig	2015-07-20 16:55:07.000000000 +0430
>X+++ cmake/plugin.cmake	2015-11-14 14:53:53.000000000 +0330
>X@@ -236,9 +236,6 @@
>X     MYSQL_INSTALL_TARGETS(${target}
>X       DESTINATION ${INSTALL_PLUGINDIR}
>X       COMPONENT ${INSTALL_COMPONENT})
>X-    INSTALL_DEBUG_TARGET(${target}
>X-      DESTINATION ${INSTALL_PLUGINDIR}/debug
>X-      COMPONENT ${INSTALL_COMPONENT})
>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"
>9a4b71b75db22a8259e96ec7af0348e3
>echo x - mysql57-server/my_dir_files/patch-include_CMakeLists.txt
>sed 's/^X//' >mysql57-server/my_dir_files/patch-include_CMakeLists.txt << 'e5e5724674613b516bf17ea5e3444b80'
>X--- include/CMakeLists.txt.orig	2015-07-20 16:55:08.000000000 +0430
>X+++ include/CMakeLists.txt	2015-11-14 15:05:38.000000000 +0330
>X@@ -64,10 +64,12 @@
>X )
>X 
>X INSTALL(FILES ../libbinlogevents/export/binary_log_types.h DESTINATION ${INSTALL_INCLUDEDIR})
>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 
>e5e5724674613b516bf17ea5e3444b80
>echo x - mysql57-server/my_dir_files/mysql-server.in
>sed 's/^X//' >mysql57-server/my_dir_files/mysql-server.in << '03cf07b91f65008b3ff9bc79ee709624'
>X#!/bin/sh
>X#
>X# $FreeBSD: tags/RELEASE_10_1_0/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"
>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=15
>X	while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
>X		timeout=$(( timeout - 1 ))
>X		sleep 1
>X	done
>X	return 0
>X}
>X
>Xrun_rc_command "$1"
>03cf07b91f65008b3ff9bc79ee709624
>echo x - mysql57-server/my_dir_files/patch-include_my_compare.h
>sed 's/^X//' >mysql57-server/my_dir_files/patch-include_my_compare.h << '6dd077a4e0cd593c99d349656ccf7f83'
>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)
>6dd077a4e0cd593c99d349656ccf7f83
>echo x - mysql57-server/my_dir_files/patch-man_CMakeLists.txt
>sed 's/^X//' >mysql57-server/my_dir_files/patch-man_CMakeLists.txt << '38be58a1a95d4b2c9c9a0d0da8a308c6'
>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)
>38be58a1a95d4b2c9c9a0d0da8a308c6
>echo x - mysql57-server/my_dir_files/patch-mysys_ssl_my_default.cc
>sed 's/^X//' >mysql57-server/my_dir_files/patch-mysys_ssl_my_default.cc << 'd2321aeb1d1ffb82b5289077edf634e9'
>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.
>d2321aeb1d1ffb82b5289077edf634e9
>echo x - mysql57-server/my_dir_files/patch-sql_sql_view.cc
>sed 's/^X//' >mysql57-server/my_dir_files/patch-sql_sql_view.cc << 'a78015ee8148d8c276ff75d3bac36c9b'
>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}
>a78015ee8148d8c276ff75d3bac36c9b
>echo x - mysql57-server/my_dir_files/patch-sql_sys_vars.cc
>sed 's/^X//' >mysql57-server/my_dir_files/patch-sql_sys_vars.cc << '5aa475fcff8a160d30e4f288c93c820e'
>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 */
>5aa475fcff8a160d30e4f288c93c820e
>echo x - mysql57-server/my_dir_files/patch-extra_CMakeLists.txt
>sed 's/^X//' >mysql57-server/my_dir_files/patch-extra_CMakeLists.txt << '9affa32ee849a9f012fc19443e3a5501'
>X--- extra/CMakeLists.txt.orig	2015-07-20 16:55:08.000000000 +0430
>X+++ extra/CMakeLists.txt	2015-11-14 15:02:18.000000000 +0330
>X@@ -137,6 +137,12 @@
>X   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
>X   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
>X   SET_TARGET_PROPERTIES(resolve_stack_dump PROPERTIES LINKER_LANGUAGE CXX)
>X+
>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 
>X # In published release builds on Solaris, we need to bundle gcc source.
>9affa32ee849a9f012fc19443e3a5501
>echo x - mysql57-server/my_dir_files/patch-libservices_CMakeLists.txt
>sed 's/^X//' >mysql57-server/my_dir_files/patch-libservices_CMakeLists.txt << '791792a55f687cd7a8b8eb5857fe87a6'
>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()
>791792a55f687cd7a8b8eb5857fe87a6
>echo x - mysql57-server/my_dir_files/patch-libmysql_CMakeLists.txt
>sed 's/^X//' >mysql57-server/my_dir_files/patch-libmysql_CMakeLists.txt << '9911877566b0a92c7b05a23a52ee1778'
>X--- libmysql/CMakeLists.txt.orig	2015-07-20 16:55:08.000000000 +0430
>X+++ libmysql/CMakeLists.txt	2015-11-14 15:10:05.000000000 +0330
>X@@ -216,7 +216,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@@ -244,12 +244,14 @@
>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 # In our special "mixed" builds, also install libstlport which will
>X # be injected into the build tree by the Sun Studio part of the build.
>X@@ -265,7 +267,8 @@
>X   # and link them together into shared library.
>X   MERGE_LIBRARIES(libmysql SHARED ${LIBS}
>X     EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
>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@@ -336,6 +339,7 @@
>X         ${INSTALL_LIBDIR} SharedLibraries)
>X     ENDFOREACH()
>X   ENDIF()
>X+ ENDIF()
>X ENDIF()
>X 
>X #
>9911877566b0a92c7b05a23a52ee1778
>echo x - mysql57-server/my_dir_files/patch-client_CMakeLists.txt
>sed 's/^X//' >mysql57-server/my_dir_files/patch-client_CMakeLists.txt << '236e9a76b5c2674f8d771b3db750ef73'
>X--- client/CMakeLists.txt.orig	2015-07-20 16:55:08.000000000 +0430
>X+++ client/CMakeLists.txt	2015-11-14 14:49:21.000000000 +0330
>X@@ -111,11 +111,13 @@
>X ENDIF()
>X 
>X ADD_DEFINITIONS(${SSL_DEFINES})
>X+IF(FALSE)
>X MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/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 IF(NOT WITHOUT_SERVER)
>X   MYSQL_ADD_EXECUTABLE(mysql_upgrade
>X@@ -135,6 +137,7 @@
>X ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
>X TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
>X 
>X+IF(FALSE)
>X MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
>X TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
>X 
>X@@ -144,13 +147,17 @@
>X MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
>X SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
>X TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
>X+ENDIF()
>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 ADD_COMPILE_FLAGS(
>X   mysqlbinlog.cc
>X@@ -167,6 +174,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 MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
>X TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
>X@@ -193,11 +201,6 @@
>X 
>X SET_TARGET_PROPERTIES (
>X   mysql_plugin
>X-  mysqlcheck
>X-  mysqldump
>X-  mysqlimport
>X-  mysqlshow
>X-  mysqlslap
>X PROPERTIES HAS_CXX TRUE)
>X 
>X ADD_DEFINITIONS(-DHAVE_DLOPEN)
>236e9a76b5c2674f8d771b3db750ef73
>echo x - mysql57-server/my_dir_files/patch-include_myisam.h
>sed 's/^X//' >mysql57-server/my_dir_files/patch-include_myisam.h << '349b0d791fd71c30fe56a5dd4633cbf5'
>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)
>349b0d791fd71c30fe56a5dd4633cbf5
>echo x - mysql57-server/my_dir_files/patch-sql_conn_handler_socket_connection.cc
>sed 's/^X//' >mysql57-server/my_dir_files/patch-sql_conn_handler_socket_connection.cc << '9ae4d528613916e7e7021e1e1737bb30'
>X--- sql/conn_handler/socket_connection.cc.orig	2015-07-20 16:55:10.000000000 +0430
>X+++ sql/conn_handler/socket_connection.cc	2015-11-14 20:53:36.000000000 +0330
>X@@ -939,20 +939,23 @@
>X     signal(SIGCHLD, SIG_DFL);
>X     request_init(&req, RQ_DAEMON, m_libwrap_name, RQ_FILE,
>X                  mysql_socket_getfd(connect_sock), NULL);
>X-    fromhost(&req);
>X+    void (*my_fromhost) (void *) = (void (*)(void *)) fromhost;
>X+    my_fromhost(&req);
>X 
>X-    if (!hosts_access(&req))
>X+    int (*my_hosts_access) (void *) = (int (*) (void *)) hosts_access;
>X+    if (!my_hosts_access(&req))
>X     {
>X       /*
>X         This may be stupid but refuse() includes an exit(0)
>X         which we surely don't want...
>X         clean_exit() - same stupid thing ...
>X       */
>X+      char *(*my_eval_client) (void *) = (char *(*) (void *)) eval_client;
>X       syslog(LOG_AUTH | m_deny_severity,
>X-             "refused connect from %s", eval_client(&req));
>X+             "refused connect from %s", my_eval_client(&req));
>X 
>X       if (req.sink)
>X-        (req.sink)(req.fd);
>X+        ((void (*)(int)) (req.sink))(req.fd);
>X 
>X       mysql_socket_shutdown(listen_sock, SHUT_RDWR);
>X       mysql_socket_close(listen_sock);
>9ae4d528613916e7e7021e1e1737bb30
>echo x - mysql57-server/patch-CMakeLists.txt
>sed 's/^X//' >mysql57-server/patch-CMakeLists.txt << 'a771b82f558ab45a715b06af7c0f0095'
>X--- CMakeLists.txt.orig	2015-11-15 23:27:10.000000000 +0330
>X+++ CMakeLists.txt	2015-11-15 23:28:48.000000000 +0330
>X@@ -448,7 +448,8 @@
>X   ${CMAKE_CURRENT_BINARY_DIR}/include
>X   ${CMAKE_SOURCE_DIR}/extra/rapidjson/include
>X   ${CMAKE_CURRENT_BINARY_DIR}/libbinlogevents/include
>X-  ${CMAKE_SOURCE_DIR}/libbinlogevents/export)
>X+  ${CMAKE_SOURCE_DIR}/libbinlogevents/export
>X+  ${CMAKE_SOURCE_DIR}/include)
>X # Add bundled or system zlib.
>X MYSQL_CHECK_ZLIB_WITH_COMPRESS()
>X # Add bundled yassl/taocrypt or system openssl.
>a771b82f558ab45a715b06af7c0f0095
>echo x - mysql57-server/patch-sql_sql_class.h
>sed 's/^X//' >mysql57-server/patch-sql_sql_class.h << '3853aebaa1756ab82ba2223c5c0b2b5c'
>X--- sql/sql_class.h.orig	2015-07-20 16:55:10.000000000 +0430
>X+++ sql/sql_class.h	2015-11-16 00:28:46.000000000 +0330
>X@@ -18,13 +18,13 @@
>X 
>X /* Classes in mysql */
>X 
>X-#include "my_global.h"
>X+#include "../include/my_global.h"
>X 
>X-#include "dur_prop.h"                     // durability_properties
>X-#include "mysql/mysql_lex_string.h"       // LEX_STRING
>X-#include "mysql_com.h"                    // Item_result
>X-#include "mysql_com_server.h"             // NET_SERVER
>X-#include "auth/sql_security_ctx.h"        // Security_context
>X+#include "../include/dur_prop.h"                     // durability_properties
>X+#include "../include/mysql/mysql_lex_string.h"       // LEX_STRING
>X+#include "../include/mysql_com.h"                    // Item_result
>X+#include "../include/mysql_com_server.h"             // NET_SERVER
>X+#include "sql_security_ctx.h"        // Security_context
>X #include "derror.h"                       // ER_THD
>X #include "discrete_interval.h"            // Discrete_interval
>X #include "handler.h"                      // KEY_CREATE_INFO
>3853aebaa1756ab82ba2223c5c0b2b5c
>echo x - mysql57-server/patch-include_my_global.h
>sed 's/^X//' >mysql57-server/patch-include_my_global.h << '44278f9438c9e79e1933a5a27fb4edc1'
>X--- include/my_global.h.orig	2015-07-20 16:55:08.000000000 +0430
>X+++ include/my_global.h	2015-11-16 00:13:41.000000000 +0330
>X@@ -25,7 +25,7 @@
>X   differences are mitigated.
>X */
>X 
>X-#include "my_config.h"
>X+#include "../../.build/include/my_config.h"
>X 
>X #define __STDC_LIMIT_MACROS	/* Enable C99 limit macros */
>X #define __STDC_FORMAT_MACROS	/* Enable C99 printf format macros */
>X@@ -566,7 +566,7 @@
>X 
>X #define MY_HOW_OFTEN_TO_WRITE	1000	/* How often we want info on screen */
>X 
>X-#include <my_byteorder.h>
>X+#include "my_byteorder.h"
>X 
>X #ifdef HAVE_CHARSET_utf8
>X #define MYSQL_UNIVERSAL_CLIENT_CHARSET "utf8"
>X@@ -628,7 +628,7 @@
>X #define MYSQL_PLUGIN_IMPORT
>X #endif
>X 
>X-#include <my_dbug.h>
>X+#include "my_dbug.h"
>X 
>X #ifdef EMBEDDED_LIBRARY
>X #define NO_EMBEDDED_ACCESS_CHECKS
>44278f9438c9e79e1933a5a27fb4edc1
>exit
>

Actions: View

Attachments on bug 204607: 163206 | 163207 | 163542 | 163543 | 164010 | 164011 | 164136 | 164137 | 164138 | 164236 | 164237 | 164239 | 164311