Attachment 178451 Details for Bug 215711 – Patch updates mysql57 to 5.7.17

[patch] Patch updates mysql57 to 5.7.17

patch-updates-mysql57.17.diff (text/plain), 14.45 KB, created by Mahdi Mokhtari on 2017-01-02 15:22:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mahdi Mokhtari

Created: 2017-01-02 15:22:26 UTC

Size: 14.45 KB

patch

obsolete

>Index: databases/mysql57-server/Makefile
>===================================================================
>--- databases/mysql57-server/Makefile	(revision 429793)
>+++ databases/mysql57-server/Makefile	(working copy)
>@@ -1,166 +1,165 @@
> # Created by: Mahdi Mokhtari <mokhi64@gmail.com>
> # $FreeBSD$
> 
> PORTNAME?=	mysql
>-PORTVERSION=	5.7.15
>-PORTREVISION?=	1
>+PORTVERSION=	5.7.17
>+PORTREVISION?=	0
> CATEGORIES=	databases ipv6
> MASTER_SITES=	MYSQL/MySQL-5.7
> PKGNAMESUFFIX?=	57-server
> DISTNAME=	${PORTNAME}-boost-${PORTVERSION}
> 
> MAINTAINER=	mokhi64@gmail.com
> COMMENT?=	Multithreaded SQL database (server)
> 
> LICENSE=	GPLv2
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> 
> SLAVEDIRS=	databases/mysql57-client
> USES=		bison:build cmake:outsource compiler:c11 compiler:c++11-lib \
> 		cpe libedit localbase perl5 shebangfix ssl
> 
> USE_PERL5=	run
> 
> MY_DBDIR=	/var/db/mysql
> MY_SECDIR=	/var/db/mysql_secure
> MY_TMPDIR=	/var/db/mysql_tmpdir
> 
> LIB_DEPENDS+=	libevent.so:devel/libevent2 \
> 		liblz4.so:archivers/liblz4
> 
> CMAKE_BUILD_TYPE=	Release
> 
> CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
> 		-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
> 		-DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
> 		-DINSTALL_DOCDIR="share/doc/mysql" \
> 		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
> 		-DINSTALL_INCLUDEDIR="include/mysql" \
> 		-DINSTALL_INFODIR="info" \
> 		-DINSTALL_LIBDIR="lib/mysql" \
> 		-DINSTALL_MANDIR="man" \
> 		-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
> 		-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
> 		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
> 		-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
> 		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
> 		-DINSTALL_SBINDIR="libexec" \
> 		-DINSTALL_SCRIPTDIR="bin" \
> 		-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
> 		-DINSTALL_SHAREDIR="share" \
> 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
> 		-DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \
> 		-DWITH_BOOST="${WRKSRC}/boost" \
> 		-DWITH_EDITLINE=system \
> 		-DWITH_LIBEVENT=system \
> 		-DWITH_LZ4=system \
> 		-DWITH_ZLIB=system \
> 		-DINSTALL_MYSQLTESTDIR=0
> 
> SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
> 
> .ifdef USE_MYSQL
> .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
> .endif
> 
> SUB_LIST=	MY_DBDIR=${MY_DBDIR} \
> 		MY_SECDIR=${MY_SECDIR} \
> 		MY_TMPDIR=${MY_TMPDIR}
> 
> PLIST_SUB=	MY_DBDIR=${MY_DBDIR} \
> 		MY_SECDIR=${MY_SECDIR} \
> 		MY_TMPDIR=${MY_TMPDIR}
> 
> # MySQL-Server part
> .if !defined(CLIENT_ONLY)
> USES+=		mysql:57
> 
> CONFLICTS_INSTALL=	mysql5[0-68-9]-server-* \
> 			mysql[0-46-9][0-9]-server-* \
> 			mariadb[0-9][0-9]-server-* \
> 			percona[0-9][0-9]-server-*
> 
> USE_RC_SUBR=	mysql-server
> 
> SUB_FILES=	my.cnf.sample
> 
> USERS=		mysql
> GROUPS=		mysql
> 
> USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
> 
> MMAN1=		my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
> 		mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \
> 		mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \
> 		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \
> 		mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \
> 		mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
> 
> CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
> 
> OPTIONS_GROUP=		STORAGE
> OPTIONS_GROUP_STORAGE=	ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA
> OPTIONS_SUB=		YES
> STORAGE_DESC=		Permissible "Storage Engines" (to compile statically into the server)
> ARCHIVE_DESC=		Compile "Archive Storage" statically in server
> BLACKHOLE_DESC=		Compile "Blackhole Storage" statically in server
> EXAMPLE_DESC=		Compile "Example Storage" statically in server
> FEDERATED_DESC=		Compile "Federated Storage" statically in server
> INNOBASE_DESC=		Compile "InnoDB Storage" statically in server
> PARTITION_DESC=		Compile "Partitioning support Storage" statically in server
> PERFSCHEMA_DESC=	Compile "Performance Schema Storage" statically in server
> 
> ARCHIVE_CMAKE_ON=	-DWITH_ARCHIVE_STORAGE_ENGINE=1
> BLACKHOLE_CMAKE_ON=	-DWITH_BLACKHOLE_STORAGE_ENGINE=1
> EXAMPLE_CMAKE_ON=	-DWITH_EXAMPLE_STORAGE_ENGINE=1
> FEDERATED_CMAKE_ON=	-DWITH_FEDERATED_STORAGE_ENGINE=1
> INNOBASE_CMAKE_ON=	-DWITH_INNOBASE_STORAGE_ENGINE=1
> PARTITION_CMAKE_ON=	-DWITH_PARTITION_STORAGE_ENGINE=1
> PERFSCHEMA_CMAKE_ON=	-DWITH_PERFSCHEMA_STORAGE_ENGINE=1
> 
> OPTIONS_GROUP+=		FEATURES
> OPTIONS_GROUP_FEATURES=	PERFSCHM
> FEATURES_DESC=		Default features knobs
> PERFSCHM_DESC=		Enable "Performance Schema" by default (High RAM usage)
> OPTIONS_DEFAULT+=	PERFSCHM
> 
> PERFSCHM_SUB_LIST+=	PERFSCHEMRC=""
> PERFSCHM_SUB_LIST_OFF+=	PERFSCHEMRC="--skip-performance-schema"
> .endif
> 
> .include <bsd.port.options.mk>
> 
> ### Just for the sake of FreeBSD 9.X ###
> .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
> .  if !defined(CLIENT_ONLY)
> EXTRA_PATCHES+=		${PATCHDIR}/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc
> .  endif
> .endif
> 
> .include <bsd.port.pre.mk>
> 
> .if ${SSL_DEFAULT} == base
> BROKEN_FreeBSD_9=	FreeBSD 9.x requires SSL from ports
> CMAKE_ARGS+=		-DWITH_SSL=system
> .else
> CMAKE_ARGS+=		-DWITH_SSL=${OPENSSLBASE}
> .endif
> 
> post-extract:
> 	@${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
> 
> post-patch:
> 	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
> 
> .if !defined(CLIENT_ONLY)
> post-install:
> 	${MKDIR} ${STAGEDIR}${ETCDIR}
> 	${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
>-
> 	${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
> 	${MKDIR} ${STAGEDIR}${MY_SECDIR}
> 	${MKDIR} ${STAGEDIR}${MY_TMPDIR}
> .endif
> 
> .include <bsd.port.post.mk>
>Index: databases/mysql57-server/distinfo
>===================================================================
>--- databases/mysql57-server/distinfo	(revision 429793)
>+++ databases/mysql57-server/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1473858917
>-SHA256 (mysql-boost-5.7.15.tar.gz) = 7342a3a3e40878378dfaee252d42a3a5b06c58237f49c2544424d27316738945
>-SIZE (mysql-boost-5.7.15.tar.gz) = 60583907
>+TIMESTAMP = 1483356681
>+SHA256 (mysql-boost-5.7.17.tar.gz) = b75bba87199ef6a6ccc5dfbcaf70949009dc12089eafad8c5254afc9002aa903
>+SIZE (mysql-boost-5.7.17.tar.gz) = 61480982
>Index: databases/mysql57-server/files/patch-sql_json__dom.h
>===================================================================
>--- databases/mysql57-server/files/patch-sql_json__dom.h	(revision 429793)
>+++ databases/mysql57-server/files/patch-sql_json__dom.h	(nonexistent)
>@@ -1,11 +0,0 @@
>---- sql/json_dom.h.orig	2016-03-28 18:06:12 UTC
>-+++ sql/json_dom.h
>-@@ -368,7 +368,7 @@ struct Json_key_comparator
>-   Json_object class.
>- */
>- typedef std::map<std::string, Json_dom *, Json_key_comparator,
>--  Malloc_allocator<std::pair<std::string, Json_dom *> > > Json_object_map;
>-+  Malloc_allocator<std::pair<const std::string, Json_dom *> > > Json_object_map;
>- 
>- /**
>-   Represents a JSON container value of type "object" (ECMA), type
>Index: databases/mysql57-server/files/patch-storage_innobase_buf_buf0buf.cc
>===================================================================
>--- databases/mysql57-server/files/patch-storage_innobase_buf_buf0buf.cc	(revision 429793)
>+++ databases/mysql57-server/files/patch-storage_innobase_buf_buf0buf.cc	(nonexistent)
>@@ -1,11 +0,0 @@
>---- storage/innobase/buf/buf0buf.cc.orig	2016-03-28 18:06:12 UTC
>-+++ storage/innobase/buf/buf0buf.cc
>-@@ -338,7 +338,7 @@ typedef std::map<
>- 	const byte*,
>- 	buf_chunk_t*,
>- 	std::less<const byte*>,
>--	ut_allocator<std::pair<const byte*, buf_chunk_t*> > >
>-+	ut_allocator<std::pair<const byte* const, buf_chunk_t*> > >
>- 	buf_pool_chunk_map_t;
>- 
>- static buf_pool_chunk_map_t*			buf_chunk_map_reg;
>Index: databases/mysql57-server/files/patch-storage_innobase_dict_dict0stats.cc
>===================================================================
>--- databases/mysql57-server/files/patch-storage_innobase_dict_dict0stats.cc	(revision 429793)
>+++ databases/mysql57-server/files/patch-storage_innobase_dict_dict0stats.cc	(nonexistent)
>@@ -1,11 +0,0 @@
>---- storage/innobase/dict/dict0stats.cc.orig	2016-03-28 18:06:12 UTC
>-+++ storage/innobase/dict/dict0stats.cc
>-@@ -139,7 +139,7 @@ then we would store 5,7,10,11,12 in the 
>- typedef std::vector<ib_uint64_t, ut_allocator<ib_uint64_t> >	boundaries_t;
>- 
>- /** Allocator type used for index_map_t. */
>--typedef ut_allocator<std::pair<const char*, dict_index_t*> >
>-+typedef ut_allocator<std::pair<const char* const, dict_index_t*> >
>- 	index_map_t_allocator;
>- 
>- /** Auxiliary map used for sorting indexes by name in dict_stats_save(). */
>Index: databases/mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc
>===================================================================
>--- databases/mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc	(revision 429793)
>+++ databases/mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc	(nonexistent)
>@@ -1,11 +0,0 @@
>---- storage/innobase/sync/sync0debug.cc.orig	2016-03-28 18:06:12 UTC
>-+++ storage/innobase/sync/sync0debug.cc
>-@@ -1702,7 +1702,7 @@ private:
>- 		const void*,
>- 		File,
>- 		std::less<const void*>,
>--		ut_allocator<std::pair<const void*, File> > >
>-+		ut_allocator<std::pair<const void* const, File> > >
>- 		Files;
>- 
>- 	typedef OSMutex	Mutex;
>Index: databases/mysql57-server/pkg-plist
>===================================================================
>--- databases/mysql57-server/pkg-plist	(revision 429793)
>+++ databases/mysql57-server/pkg-plist	(working copy)
>@@ -1,161 +1,163 @@
> bin/innochecksum
> bin/lz4_decompress
> bin/my_print_defaults
> bin/myisam_ftdump
> bin/myisamchk
> bin/myisamlog
> bin/myisampack
> bin/mysql_install_db
> bin/mysql_plugin
> bin/mysql_secure_installation
> bin/mysql_tzinfo_to_sql
> bin/mysql_upgrade
> bin/mysqld_multi
> bin/mysqld_safe
> bin/mysqldumpslow
> bin/mysqltest
> bin/mysqlxtest
> bin/perror
> bin/replace
> bin/resolve_stack_dump
> bin/resolveip
> bin/zlib_decompress
> lib/mysql/libmysqld.a
> lib/mysql/plugin/adt_null.so
> lib/mysql/plugin/auth.so
> lib/mysql/plugin/auth_test_plugin.so
>+lib/mysql/plugin/connection_control.so
> lib/mysql/plugin/daemon_example.ini
>+lib/mysql/plugin/group_replication.so
> %%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so
> lib/mysql/plugin/keyring_file.so
> lib/mysql/plugin/libdaemon_example.so
> lib/mysql/plugin/libtest_framework.so
> lib/mysql/plugin/libtest_services.so
> lib/mysql/plugin/libtest_services_threaded.so
> lib/mysql/plugin/libtest_session_detach.so
> lib/mysql/plugin/libtest_session_in_thd.so
> lib/mysql/plugin/libtest_session_info.so
> lib/mysql/plugin/libtest_sql_2_sessions.so
> lib/mysql/plugin/libtest_sql_all_col_types.so
> lib/mysql/plugin/libtest_sql_cmds_1.so
> lib/mysql/plugin/libtest_sql_commit.so
> lib/mysql/plugin/libtest_sql_complex.so
> lib/mysql/plugin/libtest_sql_errors.so
> lib/mysql/plugin/libtest_sql_lock.so
> lib/mysql/plugin/libtest_sql_processlist.so
> lib/mysql/plugin/libtest_sql_replication.so
> lib/mysql/plugin/libtest_sql_shutdown.so
> lib/mysql/plugin/libtest_sql_sqlmode.so
> lib/mysql/plugin/libtest_sql_stored_procedures_functions.so
> lib/mysql/plugin/libtest_sql_views_triggers.so
> lib/mysql/plugin/libtest_x_sessions_deinit.so
> lib/mysql/plugin/libtest_x_sessions_init.so
> lib/mysql/plugin/locking_service.so
> lib/mysql/plugin/mypluglib.so
> lib/mysql/plugin/mysql_no_login.so
> lib/mysql/plugin/mysqlx.so
> lib/mysql/plugin/qa_auth_client.so
> lib/mysql/plugin/qa_auth_interface.so
> lib/mysql/plugin/qa_auth_server.so
> lib/mysql/plugin/replication_observers_example_plugin.so
> lib/mysql/plugin/rewrite_example.so
> lib/mysql/plugin/rewriter.so
> lib/mysql/plugin/semisync_master.so
> lib/mysql/plugin/semisync_slave.so
> lib/mysql/plugin/test_security_context.so
> lib/mysql/plugin/keyring_udf.so
> lib/mysql/plugin/test_udf_services.so
> lib/mysql/plugin/validate_password.so
> lib/mysql/plugin/version_token.so
> libdata/pkgconfig/LIBMYSQL_OS_OUTPUT_NAME-NOTFOUND.pc
> libexec/mysqld
> man/man1/my_print_defaults.1.gz
> man/man1/myisam_ftdump.1.gz
> man/man1/myisamchk.1.gz
> man/man1/myisamlog.1.gz
> man/man1/myisampack.1.gz
> man/man1/mysql.server.1.gz
> man/man1/mysql_install_db.1.gz
> man/man1/mysql_plugin.1.gz
> man/man1/mysql_secure_installation.1.gz
> man/man1/mysql_tzinfo_to_sql.1.gz
> man/man1/mysql_upgrade.1.gz
> man/man1/mysqld_multi.1.gz
> man/man1/mysqld_safe.1.gz
> man/man1/mysqldumpslow.1.gz
> man/man1/mysqlman.1.gz
> man/man1/mysqltest.1.gz
> man/man1/perror.1.gz
> man/man1/replace.1.gz
> man/man1/resolve_stack_dump.1.gz
> man/man1/resolveip.1.gz
> man/man8/mysqld.8.gz
> %%DATADIR%%/bulgarian/errmsg.sys
> %%DATADIR%%/charsets/Index.xml
> %%DATADIR%%/charsets/README
> %%DATADIR%%/charsets/armscii8.xml
> %%DATADIR%%/charsets/ascii.xml
> %%DATADIR%%/charsets/cp1250.xml
> %%DATADIR%%/charsets/cp1251.xml
> %%DATADIR%%/charsets/cp1256.xml
> %%DATADIR%%/charsets/cp1257.xml
> %%DATADIR%%/charsets/cp850.xml
> %%DATADIR%%/charsets/cp852.xml
> %%DATADIR%%/charsets/cp866.xml
> %%DATADIR%%/charsets/dec8.xml
> %%DATADIR%%/charsets/geostd8.xml
> %%DATADIR%%/charsets/greek.xml
> %%DATADIR%%/charsets/hebrew.xml
> %%DATADIR%%/charsets/hp8.xml
> %%DATADIR%%/charsets/keybcs2.xml
> %%DATADIR%%/charsets/koi8r.xml
> %%DATADIR%%/charsets/koi8u.xml
> %%DATADIR%%/charsets/latin1.xml
> %%DATADIR%%/charsets/latin2.xml
> %%DATADIR%%/charsets/latin5.xml
> %%DATADIR%%/charsets/latin7.xml
> %%DATADIR%%/charsets/macce.xml
> %%DATADIR%%/charsets/macroman.xml
> %%DATADIR%%/charsets/swe7.xml
> %%DATADIR%%/czech/errmsg.sys
> %%DATADIR%%/danish/errmsg.sys
> %%DATADIR%%/dictionary.txt
> %%DATADIR%%/dutch/errmsg.sys
> %%DATADIR%%/english/errmsg.sys
> %%DATADIR%%/errmsg-utf8.txt
> %%DATADIR%%/estonian/errmsg.sys
> %%DATADIR%%/fill_help_tables.sql
> %%DATADIR%%/french/errmsg.sys
> %%DATADIR%%/german/errmsg.sys
> %%DATADIR%%/greek/errmsg.sys
> %%DATADIR%%/hungarian/errmsg.sys
> %%DATADIR%%/innodb_memcached_config.sql
> %%DATADIR%%/install_rewriter.sql
> %%DATADIR%%/italian/errmsg.sys
> %%DATADIR%%/japanese/errmsg.sys
> %%DATADIR%%/korean/errmsg.sys
> %%DATADIR%%/magic
> %%DATADIR%%/my-default.cnf
> %%DATADIR%%/mysql-log-rotate
> %%DATADIR%%/mysql.server
> %%DATADIR%%/mysql_security_commands.sql
> %%DATADIR%%/mysql_sys_schema.sql
> %%DATADIR%%/mysql_system_tables.sql
> %%DATADIR%%/mysql_system_tables_data.sql
> %%DATADIR%%/mysql_test_data_timezone.sql
> %%DATADIR%%/mysqld_multi.server
> %%DATADIR%%/norwegian-ny/errmsg.sys
> %%DATADIR%%/norwegian/errmsg.sys
> %%DATADIR%%/polish/errmsg.sys
> %%DATADIR%%/portuguese/errmsg.sys
> %%DATADIR%%/romanian/errmsg.sys
> %%DATADIR%%/russian/errmsg.sys
> %%DATADIR%%/serbian/errmsg.sys
> %%DATADIR%%/slovak/errmsg.sys
> %%DATADIR%%/spanish/errmsg.sys
> %%DATADIR%%/swedish/errmsg.sys
> %%DATADIR%%/ukrainian/errmsg.sys
> %%DATADIR%%/uninstall_rewriter.sql
> @sample(root,wheel,0644) %%ETCDIR%%/my.cnf.sample
> @dir(mysql,mysql,0750) %%ETCDIR%%/keyring
> @dir(mysql,mysql,0750) %%MY_SECDIR%%
> @dir(mysql,mysql,0750) %%MY_TMPDIR%%

Flags:

mmokhi: maintainer-approval+

Actions: View | Diff

Attachments on bug 215711: 178449 | 178451