diff options
| author | unknown <jani/jamppa@bk-internal.mysql.com> | 2007-01-11 16:42:48 +0100 |
|---|---|---|
| committer | unknown <jani/jamppa@bk-internal.mysql.com> | 2007-01-11 16:42:48 +0100 |
| commit | c1ad782319e313f41ac50d3e2f813948a3c6670c (patch) | |
| tree | 860d3e1e3f78acd71eb2c273baa83df9e299a7ab /sql/net_serv.cc | |
| parent | 50361d9a44ddce3d0253feba9c658a17b2b0a517 (diff) | |
| parent | f6a95153667dab02d11e9d71a2bf6c389ae1571b (diff) | |
| download | mariadb-git-c1ad782319e313f41ac50d3e2f813948a3c6670c.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into bk-internal.mysql.com:/data0/bk/mysql-5.0-marvel
libmysqld/lib_sql.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index b53195da3b1..da80993d3ac 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) { |