From 4469f0d34e58b83e8d335457e592fa4d47217711 Mon Sep 17 00:00:00 2001 From: Joerg Bruehe Date: Fri, 15 May 2009 09:53:50 +0200 Subject: [PATCH] Fix a bad merge: Remove a cast (which shouldn't have got here anyway) which might lose significant bits beyond 4 GB RAM. mysys/safemalloc.c: Vlad's comment to the cast: pointless cast from size_t to uint that loses significant bits, when safe_malloc allocates more than 4GB Ram. safemalloc is not used in release binaries, so it is not absolutely critical. It got into the sources by a wrong merge resolution. --- mysys/safemalloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c index 36d07b475e9..c484f1d4c54 100644 --- a/mysys/safemalloc.c +++ b/mysys/safemalloc.c @@ -174,7 +174,7 @@ void *_mymalloc(size_t size, const char *filename, uint lineno, myf MyFlags) data[size + 3]= MAGICEND3; irem->filename= (char *) filename; irem->linenum= lineno; - irem->datasize= (uint32) size; + irem->datasize= size; irem->prev= NULL; /* Add this remember structure to the linked list */