bk commit into 5.0 tree (jani:1.1903)

[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.1903 05/06/06 18:39:34 jani@stripped +3 -0
  Some fixes for 5.0.6 build for Netware.

  netware/mysql_test_run.c
    1.11 05/06/06 18:39:29 jani@stripped +2 -0
    Local fix for 5.0.6a for Netware.
    - A fix for mysql_test_run.c for Netware.

  netware/BUILD/mwenv
    1.11 05/06/06 18:39:29 jani@stripped +2 -2
    Local fix for 5.0.6a for Netware.
    - Changed compiler flags so that enum is now 4 bytes instead of 2.
    

  include/my_sys.h
    1.156 05/06/06 18:39:29 jani@stripped +4 -1
    Local fix for 5.0.6a for Netware.
    - Metrowerks has _alloca.
    - 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/jani/mydev/mysql-5.0.6-build-dev

--- 1.155/include/my_sys.h	2005-05-19 13:02:03 +03:00
+++ 1.156/include/my_sys.h	2005-06-06 18:39:29 +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
@@ -830,7 +830,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/BUILD/mwenv	2005-06-06 18:11:25 +03:00
+++ 1.11/netware/BUILD/mwenv	2005-06-06 18:39:29 +03:00
@@ -19,9 +19,9 @@
 export AR_FLAGS='-type library -o'
 export AS='mwasmnlm'
 export CC='mwccnlm -gccincludes'
-export CFLAGS='-O3 -align 8 -proc 686 -relax_pointers -dialect c'
+export CFLAGS='-enum int -O3 -align 8 -proc 686 -relax_pointers -dialect c'
 export CXX='mwccnlm -gccincludes'
-export CXXFLAGS='-O3 -align 8 -proc 686 -relax_pointers -dialect c++ -bool on -wchar_t on
-D_WCHAR_T'
+export CXXFLAGS='-enum int -O3 -align 8 -proc 686 -relax_pointers -dialect c++ -bool on
-wchar_t on -D_WCHAR_T'
 export LD='mwldnlm'
 export LDFLAGS='-entry _LibCPrelude -exit _LibCPostlude -map -flags pseudopreemption'
 export RANLIB=:

--- 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:39:29 +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); 
 }
 
 /******************************************************************************