bk commit into 5.0 tree (jani:1.1928)

[jani]

Below is the list of changes that have just been committed into a local
5.0 repository of jani. When jani does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1928 05/06/06 18:30:59 jani@stripped +2 -0
  Some fixes for Netware.

  netware/mysql_test_run.c
    1.11 05/06/06 18:30:54 jani@stripped +2 -0
    A fix for netware mysql_test_run client.

  include/my_sys.h
    1.158 05/06/06 18:30:53 jani@stripped +4 -1
    Metrowerks compiler has _alloca() nowadays.
    Netware does not have mmap()

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jani
# Host:	a193-229-222-105.elisa-laajakaista.fi
# Root:	/home/my/bk/mysql-5.0

--- 1.157/include/my_sys.h	2005-05-26 20:54:23 +03:00
+++ 1.158/include/my_sys.h	2005-06-06 18:30:53 +03:00
@@ -181,7 +181,7 @@
 #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 @@
 #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);

--- 1.10/netware/mysql_test_run.c	2005-02-10 01:41:23 +02:00
+++ 1.11/netware/mysql_test_run.c	2005-06-06 18:30:54 +03:00
@@ -1162,6 +1162,8 @@
   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); 
 }
 
 /******************************************************************************