1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge sinisa@work.mysql.com:/home/bk/mysql-4.0

Browse Source 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
This commit is contained in:
Sinisa@sinisa.nasamreza.org 2003-01-02 16:22:05 +02:00
commit da8e96351c
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sql/net_serv.cc
View File

@ -469,6 +469,7 @@ static void my_net_skip_rest(NET *net, uint32 remain, thr_alarm_t *alarmed)
ALARM alarm_buff; ALARM alarm_buff;
uint retry_count=0; uint retry_count=0;
my_bool old_mode; my_bool old_mode;
uint32 old=remain;
if (!thr_alarm_in_use(&alarmed)) if (!thr_alarm_in_use(&alarmed))
{ {
@ -490,6 +491,12 @@ static void my_net_skip_rest(NET *net, uint32 remain, thr_alarm_t *alarmed)
return; return;
} }
remain -= (uint32) length; remain -= (uint32) length;
if (!remain && old==MAX_THREE_BYTES &&
(length=vio_read(net->vio,(char*) net->buff,NET_HEADER_SIZE)))
{
old=remain= uint3korr(net->buff);
net->pkt_nr++;
}
statistic_add(bytes_received,length,&LOCK_bytes_received); statistic_add(bytes_received,length,&LOCK_bytes_received);
} }
} }
@ -647,11 +654,19 @@ my_real_read(NET *net, ulong *complen)
{ {
if (net_realloc(net,helping)) if (net_realloc(net,helping))
{ {
#ifdef MYSQL_SERVER
#ifndef NO_ALARM #ifndef NO_ALARM
if (i == 1) if (net->compress)
my_net_skip_rest(net, (uint32) len, &alarmed); {
len= packet_error;
goto end;
}
my_net_skip_rest(net, (uint32) len, &alarmed);
len=0;
#endif
#else
len= packet_error; /* Return error */
#endif #endif
len= packet_error; /* Return error */
goto end; goto end;
} }
} }

6
sql/sql_parse.cc
View File

@ -884,6 +884,12 @@ bool do_command(THD *thd)
vio_description(net->vio) )); vio_description(net->vio) ));
return TRUE; return TRUE;
} }
else if (!packet_length)
{
send_error(net,net->last_errno,NullS);
net->error=0;
DBUG_RETURN(FALSE);
}
else else
{ {
packet=(char*) net->read_pos; packet=(char*) net->read_pos;