Attachment 169038 Details for Bug 208525 – Dimitry's patch + some format handling to satisft portlint

[patch] Dimitry's patch + some format handling to satisft portlint

patch-databases_mysql57-server.libcxx38.patch (text/plain), 5.22 KB, created by Mahdi Mokhtari on 2016-04-06 14:13:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mahdi Mokhtari

Created: 2016-04-06 14:13:36 UTC

Size: 5.22 KB

patch

obsolete

>Index: databases/mysql57-server/Makefile
>===================================================================
>--- databases/mysql57-server/Makefile	(revision 408349)
>+++ databases/mysql57-server/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	mysql
> PORTVERSION=	5.7.10
>-PORTREVISION?=	3
>+PORTREVISION?=	4
> CATEGORIES=	databases ipv6
> MASTER_SITES=	MYSQL/MySQL-5.7:MySQL SF/boost/boost/1.59.0:boost
> PKGNAMESUFFIX?=	57-server
>Index: databases/mysql57-server/files/patch-include_CMakeLists.txt
>===================================================================
>--- databases/mysql57-server/files/patch-include_CMakeLists.txt	(revision 408349)
>+++ databases/mysql57-server/files/patch-include_CMakeLists.txt	(working copy)
>@@ -1,8 +1,9 @@
> --- include/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
> +++ include/CMakeLists.txt
>-@@ -69,10 +69,12 @@ SET(HEADERS 
>+@@ -68,11 +68,13 @@ SET(HEADERS 
>+   ${HEADERS_GEN_CONFIGURE}
>  )
>-
>+ 
> +IF(FALSE) 
>  INSTALL(FILES ../libbinlogevents/export/binary_log_types.h DESTINATION ${INSTALL_INCLUDEDIR})
>  INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
>Index: databases/mysql57-server/files/patch-man_CMakeLists.txt
>===================================================================
>--- databases/mysql57-server/files/patch-man_CMakeLists.txt	(revision 408349)
>+++ databases/mysql57-server/files/patch-man_CMakeLists.txt	(working copy)
>@@ -1,11 +1,13 @@
> --- man/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
> +++ man/CMakeLists.txt
>-@@ -15,8 +15,6 @@
>+@@ -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_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)
>Index: databases/mysql57-server/files/patch-sql_json__dom.h
>===================================================================
>--- databases/mysql57-server/files/patch-sql_json__dom.h	(nonexistent)
>+++ databases/mysql57-server/files/patch-sql_json__dom.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- sql/json_dom.h.orig	2015-11-29 19:16:24 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	(nonexistent)
>+++ databases/mysql57-server/files/patch-storage_innobase_buf_buf0buf.cc	(working copy)
>@@ -0,0 +1,11 @@
>+--- storage/innobase/buf/buf0buf.cc.orig	2015-11-29 19:16:24 UTC
>++++ storage/innobase/buf/buf0buf.cc
>+@@ -300,7 +300,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	(nonexistent)
>+++ databases/mysql57-server/files/patch-storage_innobase_dict_dict0stats.cc	(working copy)
>@@ -0,0 +1,11 @@
>+--- storage/innobase/dict/dict0stats.cc.orig	2015-11-29 19:16:24 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	(nonexistent)
>+++ databases/mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc	(working copy)
>@@ -0,0 +1,11 @@
>+--- storage/innobase/sync/sync0debug.cc.orig	2015-11-29 19:16:24 UTC
>++++ storage/innobase/sync/sync0debug.cc
>+@@ -1704,7 +1704,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;

Flags:

mmokhi: maintainer-approval+

Actions: View | Diff

Attachments on bug 208525: 168978 | 169038 | 169098