Dep/MySQL: Updated MySQL sources to version 5.5.9 (current GA)
This commit is contained in:
@@ -51,7 +51,7 @@ my_bool my_compress(uchar *packet, size_t *len, size_t *complen)
|
||||
if (!compbuf)
|
||||
DBUG_RETURN(*complen ? 0 : 1);
|
||||
memcpy(packet,compbuf,*len);
|
||||
my_free(compbuf,MYF(MY_WME));
|
||||
my_free(compbuf);
|
||||
}
|
||||
DBUG_RETURN(0);
|
||||
}
|
||||
@@ -73,14 +73,14 @@ uchar *my_compress_alloc(const uchar *packet, size_t *len, size_t *complen)
|
||||
|
||||
if (res != Z_OK)
|
||||
{
|
||||
my_free(compbuf, MYF(MY_WME));
|
||||
my_free(compbuf);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (*complen >= *len)
|
||||
{
|
||||
*complen= 0;
|
||||
my_free(compbuf, MYF(MY_WME));
|
||||
my_free(compbuf);
|
||||
DBUG_PRINT("note",("Packet got longer on compression; Not compressed"));
|
||||
return 0;
|
||||
}
|
||||
@@ -125,11 +125,11 @@ my_bool my_uncompress(uchar *packet, size_t len, size_t *complen)
|
||||
if (error != Z_OK)
|
||||
{ /* Probably wrong packet */
|
||||
DBUG_PRINT("error",("Can't uncompress packet, error: %d",error));
|
||||
my_free(compbuf, MYF(MY_WME));
|
||||
my_free(compbuf);
|
||||
DBUG_RETURN(1);
|
||||
}
|
||||
memcpy(packet, compbuf, *complen);
|
||||
my_free(compbuf, MYF(MY_WME));
|
||||
my_free(compbuf);
|
||||
}
|
||||
else
|
||||
*complen= len;
|
||||
@@ -250,7 +250,7 @@ int unpackfrm(uchar **unpack_data, size_t *unpack_len,
|
||||
|
||||
if (my_uncompress(data, complen, &orglen))
|
||||
{
|
||||
my_free(data, MYF(0));
|
||||
my_free(data);
|
||||
DBUG_RETURN(3);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user