diff options
| author | unknown <brian@zim.(none)> | 2006-04-15 18:17:32 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-04-15 18:17:32 -0700 |
| commit | cc62983ca2be9fe0559d3f5a326bb7284c08c4cb (patch) | |
| tree | 4deb7a54227f30d8a5d4b647405eb100c0f8ab28 /sql/net_serv.cc | |
| parent | f42b90fcb8d4625336fabc13e899b7510bebec80 (diff) | |
| download | mariadb-git-cc62983ca2be9fe0559d3f5a326bb7284c08c4cb.tar.gz | |
Final patch to remove the last of the OS2 support.
client/client_priv.h:
OS2 removal
client/mysql.cc:
OS2 removal
dbug/dbug.c:
OS2 removal
include/m_string.h:
OS2 removal
include/my_global.h:
Cleanup for have_mit
libmysql/dll.c:
OS2 removal
libmysql/get_password.c:
OS2 removal
libmysql/libmysql.c:
OS2 removal
libmysql/manager.c:
OS2 removal
sql-common/client.c:
OS2 removal
sql/event_executor.cc:
OS2 removal
sql/hostname.cc:
OS2 removal
sql/log.cc:
OS2 removal
sql/log_event.h:
OS2 removal
sql/my_lock.c:
OS2 removal
sql/mysql_priv.h:
OS2 removal
sql/mysqld.cc:
OS2 removal
sql/net_serv.cc:
OS2 removal
sql/repl_failsafe.cc:
OS2 removal
sql/slave.cc:
OS2 removal
sql/sql_base.cc:
OS2 removal
sql/sql_insert.cc:
OS2 removal
sql/sql_load.cc:
OS2 removal
sql/sql_parse.cc:
OS2 removal
sql/sql_table.cc:
OS2 removal
storage/myisam/myisamchk.c:
OS2 removal
storage/ndb/src/mgmclient/main.cpp:
OS2 removal
storage/ndb/src/mgmsrv/main.cpp:
OS2 removal
vio/vio.c:
OS2 removal
vio/viosocket.c:
OS2 removal
vio/viossl.c:
OS2 removal
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index c80bb8bad9a..9713e4bed44 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -135,7 +135,7 @@ my_bool my_net_init(NET *net, Vio* vio) if (vio != 0) /* If real connection */ { net->fd = vio_fd(vio); /* For perl DBI/DBD */ -#if defined(MYSQL_SERVER) && !defined(__WIN__) && !defined(__EMX__) && !defined(OS2) +#if defined(MYSQL_SERVER) && !defined(__WIN__) if (!(test_flags & TEST_BLOCKING)) { my_bool old_mode; @@ -604,7 +604,7 @@ net_real_write(NET *net,const char *packet,ulong len) if ((long) (length=vio_write(net->vio,pos,(uint32) (end-pos))) <= 0) { my_bool interrupted = vio_should_retry(net->vio); -#if (!defined(__WIN__) && !defined(__EMX__) && !defined(OS2)) +#if !defined(__WIN__) if ((interrupted || length==0) && !thr_alarm_in_use(&alarmed)) { if (!thr_alarm(&alarmed,(uint) net->write_timeout,&alarm_buff)) @@ -631,7 +631,7 @@ net_real_write(NET *net,const char *packet,ulong len) } } else -#endif /* (!defined(__WIN__) && !defined(__EMX__)) */ +#endif /* !defined(__WIN__) */ if (thr_alarm_in_use(&alarmed) && !thr_got_alarm(&alarmed) && interrupted) { @@ -803,7 +803,7 @@ my_real_read(NET *net, ulong *complen) DBUG_PRINT("info",("vio_read returned %d, errno: %d", length, vio_errno(net->vio))); -#if (!defined(__WIN__) && !defined(__EMX__) && !defined(OS2)) || 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 non blocking @@ -839,7 +839,7 @@ my_real_read(NET *net, ulong *complen) continue; } } -#endif /* (!defined(__WIN__) && !defined(__EMX__)) || defined(MYSQL_SERVER) */ +#endif /* (!defined(__WIN__) || defined(MYSQL_SERVER) */ if (thr_alarm_in_use(&alarmed) && !thr_got_alarm(&alarmed) && interrupted) { /* Probably in MIT threads */ |