From 068c61978e3a81836d52b8caf11e044290159ad1 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Tue, 26 Mar 2013 00:03:13 +0200 Subject: Temporary commit of 10.0-merge --- mysys/my_compress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mysys/my_compress.c') 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); -- cgit v1.2.1