diff --git a/include/my_sys.h b/include/my_sys.h
index 62affb31740..ee4312be058 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -181,7 +181,7 @@ extern void my_large_free(gptr ptr, myf my_flags);
 #endif /* _AIX */
 #if defined(__MWERKS__)
 #undef alloca
-#define alloca __alloca
+#define alloca _alloca
 #endif /* __MWERKS__ */
 #if defined(__GNUC__) && !defined(HAVE_ALLOCA_H) && ! defined(alloca)
 #define alloca __builtin_alloca
@@ -836,7 +836,10 @@ my_bool my_gethwaddr(uchar *to);
 #define MAP_NOSYNC       0x0800
 #define MAP_FAILED       ((void *)-1)
 #define MS_SYNC          0x0000
+
+#ifndef __NETWARE__
 #define HAVE_MMAP
+#endif
 
 int my_getpagesize(void);
 void *my_mmap(void *, size_t, int, int, int, my_off_t);
diff --git a/netware/mysql_test_run.c b/netware/mysql_test_run.c
index d8cfb79c1cb..45b7c4719fb 100644
--- a/netware/mysql_test_run.c
+++ b/netware/mysql_test_run.c
@@ -1162,6 +1162,8 @@ void setup(char *file)
   setenv("MYSQL_TCP_PORT", "3306", 1);
   snprintf(file_path, PATH_MAX*2, "%s/mysql_client_test --no-defaults --testcase--user=root --port=%u ", bin_dir, master_port); 
   setenv("MYSQL_CLIENT_TEST",file_path,1);
+  snprintf(file_path, PATH_MAX*2, "%s/mysql --no-defaults --user=root --port=%u ", bin_dir, master_port);
+  setenv("MYSQL",file_path,1); 
 }
 
 /******************************************************************************