merge with 4.0 to get Netware patches and fixes for libmysqld.dll

1 files changed, 15 insertions, 0 deletions

diff --git a/tools/mysqlmanager.c b/tools/mysqlmanager.c
index f1efd3be3eb..2e9f980bb5d 100644
--- a/tools/mysqlmanager.c
+++ b/tools/mysqlmanager.c
@@ -21,6 +21,8 @@
     Sasha Pachev <sasha@mysql.com>
 */
 
+#ifndef __NETWARE__
+
 #include <my_global.h>
 #include <my_pthread.h>
 #include <mysql.h>
@@ -1850,3 +1852,16 @@ int main(int argc, char** argv)
   else
     return daemonize();
 }
+
+#else
+
+#include <stdio.h>
+
+int main(void)
+{
+  fprintf(stderr,"This tool has not been ported to NetWare\n");
+  return 0;
+}
+
+#endif /* __NETWARE__ */
+