Attachment #169038 for bug #208525

Lines 3-9 Link Here

(-)databases/mysql57-server/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= mysql	4	PORTNAME= mysql
5	PORTVERSION= 5.7.10	5	PORTVERSION= 5.7.10
6	PORTREVISION?= 3	6	PORTREVISION?= 4
7	CATEGORIES= databases ipv6	7	CATEGORIES= databases ipv6
8	MASTER_SITES= MYSQL/MySQL-5.7:MySQL SF/boost/boost/1.59.0:boost	8	MASTER_SITES= MYSQL/MySQL-5.7:MySQL SF/boost/boost/1.59.0:boost
9	PKGNAMESUFFIX?= 57-server	9	PKGNAMESUFFIX?= 57-server

Lines 1-8 Link Here

(-)databases/mysql57-server/files/patch-include_CMakeLists.txt (-2 / +3 lines)
1	--- include/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- include/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC
2	+++ include/CMakeLists.txt	2	+++ include/CMakeLists.txt
3	@@ -69,10 +69,12 @@ SET(HEADERS	3	@@ -68,11 +68,13 @@ SET(HEADERS
		4	${HEADERS_GEN_CONFIGURE}
4	)	5	)
5		6
6	+IF(FALSE)	7	+IF(FALSE)
7	INSTALL(FILES ../libbinlogevents/export/binary_log_types.h DESTINATION ${INSTALL_INCLUDEDIR})	8	INSTALL(FILES ../libbinlogevents/export/binary_log_types.h DESTINATION ${INSTALL_INCLUDEDIR})
8	INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)	9	INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)




--- man/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+++ man/CMakeLists.txt
@@ -14,9 +14,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 # Copy man pages
-FILE(GLOB MAN1_FILES *.1)
-FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
-FILE(GLOB MAN1_NDB ndb*.1)
+FILE(GLOB MAN1_FILES 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)
 FILE(GLOB MAN8_FILES *.8)
 FILE(GLOB MAN8_NDB ndb*.8)
 IF(MAN1_FILES)

Line 0 Link Here

(-)databases/mysql57-server/files/patch-sql_json__dom.h (+11 lines)
	1	--- sql/json_dom.h.orig 2015-11-29 19:16:24 UTC
	2	+++ sql/json_dom.h
	3	@@ -368,7 +368,7 @@ struct Json_key_comparator
	4	Json_object class.
	5	*/
	6	typedef std::map<std::string, Json_dom *, Json_key_comparator,
	7	- Malloc_allocator<std::pair<std::string, Json_dom *> > > Json_object_map;
	8	+ Malloc_allocator<std::pair<const std::string, Json_dom *> > > Json_object_map;
	9
	10	/**
	11	Represents a JSON container value of type "object" (ECMA), type

Line 0 Link Here

(-)databases/mysql57-server/files/patch-storage_innobase_buf_buf0buf.cc (+11 lines)
	1	--- storage/innobase/buf/buf0buf.cc.orig 2015-11-29 19:16:24 UTC
	2	+++ storage/innobase/buf/buf0buf.cc
	3	@@ -300,7 +300,7 @@ typedef std::map<
	4	const byte*,
	5	buf_chunk_t*,
	6	std::less<const byte*>,
	7	- ut_allocator<std::pair<const byte, buf_chunk_t> > >
	8	+ ut_allocator<std::pair<const byte* const, buf_chunk_t*> > >
	9	buf_pool_chunk_map_t;
	10
	11	static buf_pool_chunk_map_t* buf_chunk_map_reg;

Line 0 Link Here

(-)databases/mysql57-server/files/patch-storage_innobase_dict_dict0stats.cc (+11 lines)
	1	--- storage/innobase/dict/dict0stats.cc.orig 2015-11-29 19:16:24 UTC
	2	+++ storage/innobase/dict/dict0stats.cc
	3	@@ -139,7 +139,7 @@ then we would store 5,7,10,11,12 in the
	4	typedef std::vector<ib_uint64_t, ut_allocator<ib_uint64_t> > boundaries_t;
	5
	6	/** Allocator type used for index_map_t. */
	7	-typedef ut_allocator<std::pair<const char, dict_index_t> >
	8	+typedef ut_allocator<std::pair<const char* const, dict_index_t*> >
	9	index_map_t_allocator;
	10
	11	/** Auxiliary map used for sorting indexes by name in dict_stats_save(). */

Line 0 Link Here

(-)databases/mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc (+11 lines)
	1	--- storage/innobase/sync/sync0debug.cc.orig 2015-11-29 19:16:24 UTC
	2	+++ storage/innobase/sync/sync0debug.cc
	3	@@ -1704,7 +1704,7 @@ private:
	4	const void*,
	5	File,
	6	std::less<const void*>,
	7	- ut_allocator<std::pair<const void*, File> > >
	8	+ ut_allocator<std::pair<const void* const, File> > >
	9	Files;
	10
	11	typedef OSMutex Mutex;

Return to bug 208525

Lines 1-11 Link Here

(-)databases/mysql57-server/files/patch-man_CMakeLists.txt (-2 / +4 lines)
1	--- man/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- man/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC
2	+++ man/CMakeLists.txt	2	+++ man/CMakeLists.txt
3	@@ -15,8 +15,6 @@	3	@@ -14,9 +14,7 @@
		4	# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
4		5
5	# Copy man pages	6	# Copy man pages
6	FILE(GLOB MAN1_FILES *.1)	7	-FILE(GLOB MAN1_FILES *.1)
7	-FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)	8	-FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
8	-FILE(GLOB MAN1_NDB ndb*.1)	9	-FILE(GLOB MAN1_NDB ndb*.1)
		10	+FILE(GLOB MAN1_FILES 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)
9	FILE(GLOB MAN8_FILES *.8)	11	FILE(GLOB MAN8_FILES *.8)
10	FILE(GLOB MAN8_NDB ndb*.8)	12	FILE(GLOB MAN8_NDB ndb*.8)
11	IF(MAN1_FILES)	13	IF(MAN1_FILES)