diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-12-08 19:17:49 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-12-08 19:17:49 +0100 |
| commit | e91bbca5fb080a8d988c156d78c7dc1b1daaad82 (patch) | |
| tree | edeb15da451e956ae0d6874657c910ab0df111f8 /sql/net_serv.cc | |
| parent | 5e7b949e61f4330e27013c8ec81fa3d450e5dce6 (diff) | |
| download | mariadb-git-e91bbca5fb080a8d988c156d78c7dc1b1daaad82.tar.gz | |
Initial threadpool implementation for MariaDB 5.5
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index ccc67e64ea4..9011d570497 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -842,7 +842,7 @@ my_real_read(NET *net, size_t *complen) DBUG_PRINT("info",("vio_read returned %ld errno: %d", (long) length, vio_errno(net->vio))); -#if !defined(__WIN__) || defined(MYSQL_SERVER) +#if !defined(__WIN__) && defined(MYSQL_SERVER) /* We got an error that there was no data on the socket. We now set up an alarm to not 'read forever', change the socket to the blocking @@ -874,7 +874,7 @@ my_real_read(NET *net, size_t *complen) continue; } } -#endif /* (!defined(__WIN__) || defined(MYSQL_SERVER) */ +#endif /* (!defined(__WIN__) && defined(MYSQL_SERVER) */ if (thr_alarm_in_use(&alarmed) && !thr_got_alarm(&alarmed) && interrupted) { /* Probably in MIT threads */ |