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 | 9958203b5c63ba921e99d2e1a507f9dfe4312036 (patch) | |
| tree | 4deb7a54227f30d8a5d4b647405eb100c0f8ab28 /sql-common | |
| parent | b713cb445cf7ca7ac8b519afecfe38239ad695e9 (diff) | |
| download | mariadb-git-9958203b5c63ba921e99d2e1a507f9dfe4312036.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-common')
| -rw-r--r-- | sql-common/client.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 72745d72b12..32672ce1201 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -71,11 +71,6 @@ my_bool net_flush(NET *net); #include <my_pthread.h> /* because of signal() */ #endif /* defined(THREAD) && !defined(__WIN__) */ -#if defined(OS2) && defined(MYSQL_SERVER) -#undef ER -#define ER CER -#endif /* defined( OS2) && defined(MYSQL_SERVER) */ - #include <sys/stat.h> #include <signal.h> #include <time.h> @@ -126,7 +121,7 @@ const char *def_shared_memory_base_name= default_shared_memory_base_name; static void mysql_close_free_options(MYSQL *mysql); static void mysql_close_free(MYSQL *mysql); -#if !(defined(__WIN__) || defined(OS2) || defined(__NETWARE__)) +#if !(defined(__WIN__) || defined(__NETWARE__)) static int wait_for_data(my_socket fd, uint timeout); #endif @@ -143,7 +138,7 @@ static int wait_for_data(my_socket fd, uint timeout); int my_connect(my_socket fd, const struct sockaddr *name, uint namelen, uint timeout) { -#if defined(__WIN__) || defined(OS2) || defined(__NETWARE__) +#if defined(__WIN__) || defined(__NETWARE__) return connect(fd, (struct sockaddr*) name, namelen); #else int flags, res, s_err; @@ -183,7 +178,7 @@ int my_connect(my_socket fd, const struct sockaddr *name, uint namelen, If not, we will use select() */ -#if !(defined(__WIN__) || defined(OS2) || defined(__NETWARE__)) +#if !(defined(__WIN__) || defined(__NETWARE__)) static int wait_for_data(my_socket fd, uint timeout) { @@ -274,7 +269,7 @@ static int wait_for_data(my_socket fd, uint timeout) return (0); /* ok */ #endif /* HAVE_POLL */ } -#endif /* defined(__WIN__) || defined(OS2) || defined(__NETWARE__) */ +#endif /* defined(__WIN__) || defined(__NETWARE__) */ /* |