Commit 4469f0d3 authored by Joerg Bruehe's avatar Joerg Bruehe

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.
parent 09cf42a2
......@@ -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 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment