diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-08-21 23:31:33 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-08-21 23:31:33 +0300 |
| commit | 656da11b9163261ab661f1c22c16758e7b5482a6 (patch) | |
| tree | 9ded9399004e592a31fb8cd0f72e01e53ccf3301 /sql/net_serv.cc | |
| parent | 7ba2adcc0184aaa72ec284de6930f0ae0c72852c (diff) | |
| download | mariadb-git-656da11b9163261ab661f1c22c16758e7b5482a6.tar.gz | |
Portability fix.
mysys/thr_alarm.c:
Fixed portability problem with thr_alarm.c
readline/display.c:
Removed compiler warning
sql/net_serv.cc:
Added DBUG_ENTER in net_clear.
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index da4f75e74b5..bb7100f31be 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -162,20 +162,24 @@ static my_bool net_realloc(NET *net, ulong length) void net_clear(NET *net) { + DBUG_ENTER("net_clear"); #if !defined(EXTRA_DEBUG) && !defined(EMBEDDED_LIBRARY) - int count; /* One may get 'unused' warn */ - my_bool old_mode; - if (!vio_blocking(net->vio, FALSE, &old_mode)) { - while ( (count = vio_read(net->vio, (char*) (net->buff), - (uint32) net->max_packet)) > 0) - DBUG_PRINT("info",("skipped %d bytes from file: %s", - count,vio_description(net->vio))); - vio_blocking(net->vio, TRUE, &old_mode); + int count; /* One may get 'unused' warn */ + my_bool old_mode; + if (!vio_blocking(net->vio, FALSE, &old_mode)) + { + while ((count = vio_read(net->vio, (char*) (net->buff), + (uint32) net->max_packet)) > 0) + DBUG_PRINT("info",("skipped %d bytes from file: %s", + count, vio_description(net->vio))); + vio_blocking(net->vio, TRUE, &old_mode); + } } #endif /* EXTRA_DEBUG */ net->pkt_nr=net->compress_pkt_nr=0; /* Ready for new command */ net->write_pos=net->buff; + DBUG_VOID_RETURN; } /* Flush write_buffer if not empty. */ |