database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-06-16 11:21:15 +03:00
Code Activity

Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0

Browse Source 
sql/net_serv.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
This commit is contained in:
unknown
2003-01-02 16:26:26 +02:00
parent ba8ed9315a 8ec8636c41
commit 62b38d20dd
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/net_serv.cc
View File

@ -479,6 +479,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))
{ {
@ -500,6 +501,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);
} }
} }
@ -660,11 +667,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)
{
len= packet_error;
goto end;
}
my_net_skip_rest(net, (uint32) len, &alarmed); my_net_skip_rest(net, (uint32) len, &alarmed);
len=0;
#endif #endif
#else
len= packet_error; /* Return error */ len= packet_error; /* Return error */
#endif
goto end; goto end;
} }
} }

6
sql/sql_parse.cc
View File

@ -886,6 +886,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;