diff options
author | unknown <konstantin@mysql.com> | 2005-01-11 14:47:12 +0300 |
---|---|---|
committer | unknown <konstantin@mysql.com> | 2005-01-11 14:47:12 +0300 |
commit | 7bf677dd64bd6c1362899bf07aca977f144c5fa4 (patch) | |
tree | ac67686cd6fe594e418541c378b09f3e55cad984 /sql/net_serv.cc | |
parent | 28f86d8ff1d042a2224c64712e31c65b1d6b7476 (diff) | |
parent | 194937169f340d35a36ef74def972e1699df477c (diff) | |
download | mariadb-git-7bf677dd64bd6c1362899bf07aca977f144c5fa4.tar.gz |
Merge mysql.com:/home/kostja/work/mysql-4.1-7428
into mysql.com:/home/kostja/work/mysql-5.0-root
sql/net_serv.cc:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'sql/net_serv.cc')
-rw-r--r-- | sql/net_serv.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 55f56645f82..bd3bbe3e1a9 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -255,7 +255,7 @@ my_bool my_net_write(NET *net,const char *packet,ulong len) { uchar buff[NET_HEADER_SIZE]; - if (unlikely(!net->vio)) // nowhere to write + if (unlikely(!net->vio)) /* nowhere to write */ return 0; /* Big packets are handled by splitting them in packets of MAX_PACKET_LENGTH |