summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2010-07-15 08:13:30 -0300
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2010-07-15 08:13:30 -0300
commitf54a1182494db9bababccfa83692630bec51ca95 (patch)
tree2c9b96009bfea8eef82d21e14a61f7306827f917 /sql-common
parent508522e5f74270ebdca94cfa0b0159ee36d2678f (diff)
downloadmariadb-git-f54a1182494db9bababccfa83692630bec51ca95.tar.gz
WL#5486: Remove code for unsupported platforms
Remove Netware specific code.
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/client.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index c277b153109..0661cc41096 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -126,7 +126,7 @@ static void mysql_close_free_options(MYSQL *mysql);
static void mysql_close_free(MYSQL *mysql);
static void mysql_prune_stmt_list(MYSQL *mysql);
-#if !(defined(__WIN__) || defined(__NETWARE__))
+#if !defined(__WIN__)
static int wait_for_data(my_socket fd, uint timeout);
#endif
@@ -148,7 +148,7 @@ char mysql_server_last_error[MYSQL_ERRMSG_SIZE];
int my_connect(my_socket fd, const struct sockaddr *name, uint namelen,
uint timeout)
{
-#if defined(__WIN__) || defined(__NETWARE__)
+#if defined(__WIN__)
DBUG_ENTER("my_connect");
DBUG_RETURN(connect(fd, (struct sockaddr*) name, namelen));
#else
@@ -193,7 +193,7 @@ int my_connect(my_socket fd, const struct sockaddr *name, uint namelen,
If not, we will use select()
*/
-#if !(defined(__WIN__) || defined(__NETWARE__))
+#if !defined(__WIN__)
static int wait_for_data(my_socket fd, uint timeout)
{
@@ -316,7 +316,7 @@ static int wait_for_data(my_socket fd, uint timeout)
DBUG_RETURN(0); /* ok */
#endif /* HAVE_POLL */
}
-#endif /* defined(__WIN__) || defined(__NETWARE__) */
+#endif /* !defined(__WIN__) */
/**
Set the internal error message to mysql handler