diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2009-05-15 09:53:50 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2009-05-15 09:53:50 +0200 |
| commit | 4469f0d34e58b83e8d335457e592fa4d47217711 (patch) | |
| tree | f0a5f4865dea7791481b7b2ed5c283111dcff60b | |
| parent | 09cf42a24f2ec231a3903e1805613e5f173c7245 (diff) | |
| download | mariadb-git-4469f0d34e58b83e8d335457e592fa4d47217711.tar.gz | |
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.
| -rw-r--r-- | mysys/safemalloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |