diff options
| author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-06-06 18:30:59 +0300 |
|---|---|---|
| committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-06-06 18:30:59 +0300 |
| commit | e515cd1b89f6a6c819db93de0154b55eded52f6e (patch) | |
| tree | 7cf4d398b687ffb3442423799a02160b22324446 | |
| parent | 9d5e2e915a36677acf80fb1378ba45ff2b399c33 (diff) | |
| download | mariadb-git-e515cd1b89f6a6c819db93de0154b55eded52f6e.tar.gz | |
Some fixes for Netware.
include/my_sys.h:
Metrowerks compiler has _alloca() nowadays.
Netware does not have mmap()
netware/mysql_test_run.c:
A fix for netware mysql_test_run client.
| -rw-r--r-- | include/my_sys.h | 5 | ||||
| -rw-r--r-- | netware/mysql_test_run.c | 2 |
2 files changed, 6 insertions, 1 deletions
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); } /****************************************************************************** |