diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-03-26 00:03:13 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-03-26 00:03:13 +0200 |
| commit | 068c61978e3a81836d52b8caf11e044290159ad1 (patch) | |
| tree | 2cbca861ab2cebe3bd99379ca9668bb483ca0d2a /mysys/my_compress.c | |
| parent | 35bc8f9f4353b64da215e52ff6f1612a8ce66f43 (diff) | |
| download | mariadb-git-068c61978e3a81836d52b8caf11e044290159ad1.tar.gz | |
Temporary commit of 10.0-merge
Diffstat (limited to 'mysys/my_compress.c')
| -rw-r--r-- | mysys/my_compress.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_compress.c b/mysys/my_compress.c index ea56900db05..6b223d2b354 100644 --- a/mysys/my_compress.c +++ b/mysys/my_compress.c @@ -311,7 +311,7 @@ int unpackfrm(uchar **unpack_data, size_t *unpack_len, if (ver != 1) DBUG_RETURN(1); - if (!(data= my_malloc(max(orglen, complen), MYF(MY_WME)))) + if (!(data= my_malloc(MY_MAX(orglen, complen), MYF(MY_WME)))) DBUG_RETURN(2); memcpy(data, pack_data + BLOB_HEADER, complen); |