summaryrefslogtreecommitdiff
path: root/netware/my_manage.c
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-05-26 19:12:49 +0300
committermonty@mysql.com <>2004-05-26 19:12:49 +0300
commit7d8f8bc77bd58b0a527a3874cda55311a068d05b (patch)
tree45397c78051c557e55bc9b5df93c68604da6a451 /netware/my_manage.c
parent2709f91947ab50ab206c523e97636b82ee89b9d3 (diff)
downloadmariadb-git-7d8f8bc77bd58b0a527a3874cda55311a068d05b.tar.gz
Changed prototype of killed_ptr() to make it more portable
Applied patches for Netware
Diffstat (limited to 'netware/my_manage.c')
-rw-r--r--netware/my_manage.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/netware/my_manage.c b/netware/my_manage.c
index f5aa3163431..29514837837 100644
--- a/netware/my_manage.c
+++ b/netware/my_manage.c
@@ -200,11 +200,11 @@ int wait_for_server_start(char *bin_dir, char *user, char *password, int port,ch
add_arg(&al, "--password=%s", password);
add_arg(&al, "--silent");
- /** Not supported on NetWare
+#ifdef NOT_USED
add_arg(&al, "-O");
add_arg(&al, "connect_timeout=10");
add_arg(&al, "-w");
- **/
+#endif
add_arg(&al, "--host=localhost");
add_arg(&al, "ping");
@@ -475,4 +475,3 @@ void get_basedir(char *argv0, char *basedir)
strcpy(basedir, temp);
}
}
-