mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
2d89861033
Extended max_allowed_packet for clients to 1G Fixed bug in sending compressed rows >= 16M Fix bug in skiping too long packets from clients. Added checking of wrong command number sent by client. include/mysql.h: Added max_allowed_packet as option parameter. include/mysql_com.h: Added COM_END to be able to check for wrong commands. libmysql/libmysql.c: Extended max_allowed_packet for clients to 1G Added support for max_allowed_packet in option files read by mysql_option() mysys/my_compress.c: Debugging output sql/net_pkg.cc: Fixed wrong handling of blobs >= 16M sql/net_serv.cc: Changed MAX_THREE_BYTES -> MAX_PACKET_LENGTH More DEBUG output and more comments Fixed bug in sending compressed rows >= 16M Optimized sending of big packets (fewer memcpy and compress data in bigger blocks) Fix bug in skiping too long packets from clients. (old code didn't always work for big packets) sql/sql_class.h: Changed type of variable sql/sql_parse.cc: Added checking of wrong command number sent by client. Changed handling of too big packets to make code safer tests/big_record.pl: E
98 lines
2.8 KiB
C
98 lines
2.8 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/* Written by Sinisa Milivojevic <sinisa@mysql.com> */
|
|
|
|
#include <my_global.h>
|
|
#ifdef HAVE_COMPRESS
|
|
#include <my_sys.h>
|
|
#ifndef SCO
|
|
#include <m_string.h>
|
|
#endif
|
|
#include <zlib.h>
|
|
|
|
/*
|
|
** This replaces the packet with a compressed packet
|
|
** Returns 1 on error
|
|
** *complen is 0 if the packet wasn't compressed
|
|
*/
|
|
|
|
my_bool my_compress(byte *packet, ulong *len, ulong *complen)
|
|
{
|
|
DBUG_ENTER("my_compress");
|
|
if (*len < MIN_COMPRESS_LENGTH)
|
|
{
|
|
*complen=0;
|
|
DBUG_PRINT("note",("Packet too short: Not compressed"));
|
|
}
|
|
else
|
|
{
|
|
byte *compbuf=my_compress_alloc(packet,len,complen);
|
|
if (!compbuf)
|
|
DBUG_RETURN(*complen ? 0 : 1);
|
|
memcpy(packet,compbuf,*len);
|
|
my_free(compbuf,MYF(MY_WME)); }
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
byte *my_compress_alloc(const byte *packet, ulong *len, ulong *complen)
|
|
{
|
|
byte *compbuf;
|
|
*complen= *len * 120 / 100 + 12;
|
|
if (!(compbuf= (byte *) my_malloc(*complen,MYF(MY_WME))))
|
|
return 0; /* Not enough memory */
|
|
if (compress((Bytef*) compbuf,(ulong *) complen, (Bytef*) packet,
|
|
(uLong) *len ) != Z_OK)
|
|
{
|
|
my_free(compbuf,MYF(MY_WME));
|
|
return 0;
|
|
}
|
|
if (*complen >= *len)
|
|
{
|
|
*complen= 0;
|
|
my_free(compbuf, MYF(MY_WME));
|
|
DBUG_PRINT("note",("Packet got longer on compression; Not compressed"));
|
|
return 0;
|
|
}
|
|
swap(ulong, *len, *complen); /* *len is now packet length */
|
|
return compbuf;
|
|
}
|
|
|
|
|
|
my_bool my_uncompress (byte *packet, ulong *len, ulong *complen)
|
|
{
|
|
DBUG_ENTER("my_uncompress");
|
|
if (*complen) /* If compressed */
|
|
{
|
|
byte *compbuf= (byte *) my_malloc(*complen,MYF(MY_WME));
|
|
int error;
|
|
if (!compbuf)
|
|
DBUG_RETURN(1); /* Not enough memory */
|
|
if ((error=uncompress((Bytef*) compbuf, complen, (Bytef*) packet, *len))
|
|
!= Z_OK)
|
|
{ /* Probably wrong packet */
|
|
DBUG_PRINT("error",("Can't uncompress packet, error: %d",error));
|
|
my_free(compbuf, MYF(MY_WME));
|
|
DBUG_RETURN(1);
|
|
}
|
|
*len= *complen;
|
|
memcpy(packet, compbuf, *len);
|
|
my_free(compbuf, MYF(MY_WME));
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
#endif /* HAVE_COMPRESS */
|