4 files changed, 0 insertions, 44 deletions

diff --git a/databases/mysql57-server/files/patch-sql_json__dom.h b/databases/mysql57-server/files/patch-sql_json__dom.h
index 14fc069505cb..00734d46143d 100644
--- a/databases/mysql57-server/files/patch-sql_json__dom.h
+++ b/databases/mysql57-server/files/patch-sql_json__dom.h
@@ -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
diff --git a/databases/mysql57-server/files/patch-storage_innobase_buf_buf0buf.cc b/databases/mysql57-server/files/patch-storage_innobase_buf_buf0buf.cc
index ee535e2f6455..acf8cf9f4541 100644
--- a/databases/mysql57-server/files/patch-storage_innobase_buf_buf0buf.cc
+++ b/databases/mysql57-server/files/patch-storage_innobase_buf_buf0buf.cc
@@ -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;
diff --git a/databases/mysql57-server/files/patch-storage_innobase_dict_dict0stats.cc b/databases/mysql57-server/files/patch-storage_innobase_dict_dict0stats.cc
index d5d5d6ab3393..7035d77ff3b2 100644
--- a/databases/mysql57-server/files/patch-storage_innobase_dict_dict0stats.cc
+++ b/databases/mysql57-server/files/patch-storage_innobase_dict_dict0stats.cc
@@ -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(). */
diff --git a/databases/mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc b/databases/mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc
index 30d9d2d06b99..e73f8d216ba0 100644
--- a/databases/mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc
+++ b/databases/mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc
@@ -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;