========================================================================================== --- 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 --- 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 ========================================================================================== --- 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; --- 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; ========================================================================================== --- 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(). */ --- 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(). */ ========================================================================================== --- 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; --- 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;