From owner-svn-ports-head@freebsd.org Fri Apr 8 08:42:36 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7CB37B074DE; Fri, 8 Apr 2016 08:42:36 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5423A16D6; Fri, 8 Apr 2016 08:42:36 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u388gZ48039273; Fri, 8 Apr 2016 08:42:35 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u388gZxC039268; Fri, 8 Apr 2016 08:42:35 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201604080842.u388gZxC039268@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Fri, 8 Apr 2016 08:42:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412723 - head/databases/mysql57-server/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Apr 2016 08:42:36 -0000 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 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 > > Json_object_map; -+ Malloc_allocator > > 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, -- ut_allocator > > -+ ut_allocator > > - 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 > boundaries_t; - - /** Allocator type used for index_map_t. */ --typedef ut_allocator > -+typedef ut_allocator > - 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, -- ut_allocator > > -+ ut_allocator > > - Files; - - typedef OSMutex Mutex;