View | Details | Raw Unified | Return to bug 208525 | Differences between
and this patch

Collapse All | Expand All

(-)databases/mysql57-server/files/patch-sql_json_dom.h (+11 lines)
Line 0 Link Here
1 
--- sql/json_dom.h.orig	2015-11-29 20:16:24.000000000 +0100
2 
+++ sql/json_dom.h	2016-04-04 15:21:11.465791000 +0200
3 
@@ -368,7 +368,7 @@
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
(-)databases/mysql57-server/files/patch-storage_innobase_buf_buf0buf.cc (+11 lines)
Line 0 Link Here
1 
--- storage/innobase/buf/buf0buf.cc.orig	2015-11-29 20:16:24.000000000 +0100
2 
+++ storage/innobase/buf/buf0buf.cc	2016-04-04 14:24:39.457768000 +0200
3 
@@ -300,7 +300,7 @@
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;
(-)databases/mysql57-server/files/patch-storage_innobase_dict_dict0stats.cc (+11 lines)
Line 0 Link Here
1 
--- storage/innobase/dict/dict0stats.cc.orig	2015-11-29 20:16:24.000000000 +0100
2 
+++ storage/innobase/dict/dict0stats.cc	2016-04-04 14:34:32.623798000 +0200
3 
@@ -139,7 +139,7 @@
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(). */
(-)databases/mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc (+11 lines)
Line 0 Link Here
1 
--- storage/innobase/sync/sync0debug.cc.orig	2015-11-29 20:16:24.000000000 +0100
2 
+++ storage/innobase/sync/sync0debug.cc	2016-04-04 15:23:18.356074000 +0200
3 
@@ -1704,7 +1704,7 @@
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