Date: Fri, 8 Apr 2016 08:42:35 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412723 - head/databases/mysql57-server/files Message-ID: <201604080842.u388gZxC039268@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim (src committer) Date: Fri Apr 8 08:42:34 2016 New Revision: 412723 URL: https://svnweb.freebsd.org/changeset/ports/412723 Log: Fix patches that were accidentally concatenated twice in r412695. Reported by: Vladimir Omelchuk <admin@vladiom.com.ua> Pointy hat to: dim PR: 208525 MFH: 2016Q2 Modified: head/databases/mysql57-server/files/patch-sql_json__dom.h head/databases/mysql57-server/files/patch-storage_innobase_buf_buf0buf.cc head/databases/mysql57-server/files/patch-storage_innobase_dict_dict0stats.cc head/databases/mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc Modified: head/databases/mysql57-server/files/patch-sql_json__dom.h ============================================================================== --- head/databases/mysql57-server/files/patch-sql_json__dom.h Fri Apr 8 08:00:15 2016 (r412722) +++ head/databases/mysql57-server/files/patch-sql_json__dom.h Fri Apr 8 08:42:34 2016 (r412723) @@ -9,14 +9,3 @@ /** Represents a JSON container value of type "object" (ECMA), type ---- 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 Modified: head/databases/mysql57-server/files/patch-storage_innobase_buf_buf0buf.cc ============================================================================== --- head/databases/mysql57-server/files/patch-storage_innobase_buf_buf0buf.cc Fri Apr 8 08:00:15 2016 (r412722) +++ head/databases/mysql57-server/files/patch-storage_innobase_buf_buf0buf.cc Fri Apr 8 08:42:34 2016 (r412723) @@ -9,14 +9,3 @@ buf_pool_chunk_map_t; static buf_pool_chunk_map_t* buf_chunk_map_reg; ---- 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; Modified: head/databases/mysql57-server/files/patch-storage_innobase_dict_dict0stats.cc ============================================================================== --- head/databases/mysql57-server/files/patch-storage_innobase_dict_dict0stats.cc Fri Apr 8 08:00:15 2016 (r412722) +++ head/databases/mysql57-server/files/patch-storage_innobase_dict_dict0stats.cc Fri Apr 8 08:42:34 2016 (r412723) @@ -9,14 +9,3 @@ index_map_t_allocator; /** Auxiliary map used for sorting indexes by name in dict_stats_save(). */ ---- 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(). */ Modified: head/databases/mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc ============================================================================== --- head/databases/mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc Fri Apr 8 08:00:15 2016 (r412722) +++ head/databases/mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc Fri Apr 8 08:42:34 2016 (r412723) @@ -9,14 +9,3 @@ Files; typedef OSMutex Mutex; ---- 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604080842.u388gZxC039268>