diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2007-02-21 14:07:08 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2007-02-21 14:07:08 +0200 |
| commit | 26aa385bc5278ec0ae842cf6558d8fd32b6876f1 (patch) | |
| tree | 57fb0c9c6c3686011b021c42671cf5065cdc0cf6 /sql/net_serv.cc | |
| parent | 37cedb7efad7568b496eb981e40a0910c0e22494 (diff) | |
| parent | 222e128b34e7cfa67270a03c3d690d81dc0bc17b (diff) | |
| download | mariadb-git-26aa385bc5278ec0ae842cf6558d8fd32b6876f1.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 16b36b927d6..ef929bc67f0 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -221,6 +221,8 @@ my_bool net_realloc(NET *net, ulong length) -1 Don't know if data is ready or not */ +#if !defined(EMBEDDED_LIBRARY) + static int net_data_is_ready(my_socket sd) { #ifdef HAVE_POLL @@ -255,9 +257,10 @@ static int net_data_is_ready(my_socket sd) return 0; else return test(res ? FD_ISSET(sd, &sfds) : 0); -#endif +#endif /* HAVE_POLL */ } +#endif /* EMBEDDED_LIBRARY */ /* Remove unwanted characters from connection @@ -282,8 +285,11 @@ static int net_data_is_ready(my_socket sd) void net_clear(NET *net) { +#if !defined(EMBEDDED_LIBRARY) int count, ready; +#endif DBUG_ENTER("net_clear"); + #if !defined(EMBEDDED_LIBRARY) while((ready= net_data_is_ready(net->vio->sd)) > 0) { @@ -293,7 +299,7 @@ void net_clear(NET *net) { DBUG_PRINT("info",("skipped %d bytes from file: %s", count, vio_description(net->vio))); -#ifdef EXTRA_DEBUG +#if defined(EXTRA_DEBUG) && (MYSQL_VERSION_ID < 51000) fprintf(stderr,"skipped %d bytes from file: %s\n", count, vio_description(net->vio)); #endif |