database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-08 14:02:17 +03:00
Code Activity

Merge branch 'master' into serg-integr

Browse Source
This commit is contained in:
Sergei Golubchik
2016-09-15 09:21:30 +02:00
parent b9d6bea263 9b436eaaf7
commit f95877dc5f
14 changed files with 474 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libmariadb/ma_net.c
View File

@@ -450,19 +450,7 @@ ma_real_read(NET *net, size_t *complen)
if (i == 0)
{ /* First parts is packet length */
ulong helping;
if (net->buff[net->where_b + 3] != (uchar) net->pkt_nr)
{
if (net->buff[net->where_b] != (uchar) 255)
{
#ifdef EXTRA_DEBUG
fprintf(stderr,"Packets out of order (Found: %d, expected %d)\n",
(int) net->buff[net->where_b + 3],
(uint) (uchar) net->pkt_nr);
#endif
}
len= packet_error;
goto end;
}
net->pkt_nr= net->buff[net->where_b + 3];
net->compress_pkt_nr= ++net->pkt_nr;
#ifdef HAVE_COMPRESS
if (net->compress)