diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-01-02 16:22:05 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-01-02 16:22:05 +0200 |
| commit | 8ec8636c41b3e9823fa7222e1dfe4d68fbb9ac76 (patch) | |
| tree | f42021efb41cb92e5ee604f4a378a7551adadc3e /sql | |
| parent | bc1718c915e62b8612804c35cb71f4d7756a2115 (diff) | |
| parent | 41dc1eaa4f79e0398d652ad4c89638acb4655d80 (diff) | |
| download | mariadb-git-8ec8636c41b3e9823fa7222e1dfe4d68fbb9ac76.tar.gz | |
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/net_serv.cc | 21 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 6 |
2 files changed, 24 insertions, 3 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 122793b07a7..d01b28863b9 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -469,6 +469,7 @@ static void my_net_skip_rest(NET *net, uint32 remain, thr_alarm_t *alarmed) ALARM alarm_buff; uint retry_count=0; my_bool old_mode; + uint32 old=remain; 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; } 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); } } @@ -647,11 +654,19 @@ my_real_read(NET *net, ulong *complen) { if (net_realloc(net,helping)) { +#ifdef MYSQL_SERVER #ifndef NO_ALARM - if (i == 1) - my_net_skip_rest(net, (uint32) len, &alarmed); + if (net->compress) + { + len= packet_error; + goto end; + } + my_net_skip_rest(net, (uint32) len, &alarmed); + len=0; +#endif +#else + len= packet_error; /* Return error */ #endif - len= packet_error; /* Return error */ goto end; } } diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index d9f2b9ca70d..1e690df20dd 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -884,6 +884,12 @@ bool do_command(THD *thd) vio_description(net->vio) )); return TRUE; } + else if (!packet_length) + { + send_error(net,net->last_errno,NullS); + net->error=0; + DBUG_RETURN(FALSE); + } else { packet=(char*) net->read_pos; |