bk commit into 4.1 tree (kent:1.2226)

[Kent Boortz]

Below is the list of changes that have just been committed into a local
4.1 repository of kent. When kent 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.2226 05/05/05 09:15:14 kent@stripped +5 -0
  terminal.c, sql_bitmap.h, my_sys.h, configure.in, config.h:
    Initial Metrowerks CodeWarrior compiler support

  cmd-line-utils/readline/terminal.c
    1.13 05/05/05 09:12:54 kent@stripped +1 -1
    Initial Metrowerks CodeWarrior compiler support

  sql/sql_bitmap.h
    1.7 05/05/05 09:11:39 kent@stripped +1 -1
    Initial Metrowerks CodeWarrior compiler support

  include/my_sys.h
    1.135 05/05/05 09:11:39 kent@stripped +4 -0
    Initial Metrowerks CodeWarrior compiler support

  configure.in
    1.369 05/05/05 09:11:39 kent@stripped +21 -2
    Initial Metrowerks CodeWarrior compiler support

  cmd-line-utils/libedit/config.h
    1.4 05/05/05 09:11:39 kent@stripped +2 -0
    Initial Metrowerks CodeWarrior compiler support

# 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:	kent
# Host:	g4.boortz.dyndns.org
# Root:	/Users/kent/mysql/cw/mysql-4.1

--- 1.368/configure.in	2005-05-02 17:05:57 +02:00
+++ 1.369/configure.in	2005-05-05 09:11:39 +02:00
@@ -127,8 +127,25 @@
 # This generates rules for webpage generation for the MySQL homepage.
 AM_CONDITIONAL(LOCAL, test -d ../web/SitePages)
 
-# This is need before AC_PROG_CC
-#
+##############################################################################
+# The below section needs to be done before AC_PROG_CC
+##############################################################################
+
+# Hack for OS X/Darwin and Metrowerks CodeWarrior
+AC_ARG_WITH(darwin-mwcc,
+[  --with-darwin-mwcc      Use Metrowerks CodeWarrior wrappers on OS X/Darwin],[
+  builddir=`pwd`
+  ccwrapper="$builddir/support-files/MacOSX/mwcc-wrapper"
+  arwrapper="$builddir/support-files/MacOSX/mwar-wrapper"
+  CC="$ccwrapper"
+  CXX="$ccwrapper"
+  LD="$ccwrapper"
+  AR="$arwrapper"
+  RANLIB=:
+  export CC CXX LD AR RANLIB
+  AC_SUBST(AR)
+  AC_SUBST(RANLIB)
+])
 
 if test "x${CFLAGS-}" = x ; then
   cflags_is_set=no
@@ -147,6 +164,8 @@
 else
   ldflags_is_set=yes
 fi
+
+################ End of section to be done before AC_PROG_CC #################
 
 # The following hack should ensure that configure doesn't add optimizing
 # or debugging flags to CFLAGS or CXXFLAGS

--- 1.134/include/my_sys.h	2005-04-28 18:28:44 +02:00
+++ 1.135/include/my_sys.h	2005-05-05 09:11:39 +02:00
@@ -163,6 +163,10 @@
 #if defined(_AIX) && !defined(__GNUC__) && !defined(_AIX43)
 #pragma alloca
 #endif /* _AIX */
+#if defined(__MWERKS__)
+#undef alloca
+#define alloca __alloca
+#endif /* __MWERKS__ */
 #if defined(__GNUC__) && !defined(HAVE_ALLOCA_H) && ! defined(alloca)
 #define alloca __builtin_alloca
 #endif /* GNUC */

--- 1.12/cmd-line-utils/readline/terminal.c	2005-04-19 13:12:15 +02:00
+++ 1.13/cmd-line-utils/readline/terminal.c	2005-05-05 09:12:54 +02:00
@@ -346,7 +346,7 @@
   register unsigned int i;
 
   for (i = 0; i < NUM_TC_STRINGS; i++)
-#  ifdef __LCC__
+#  if defined(__LCC__) || defined(__MWERKS__)
     *(tc_strings[i].tc_value) = tgetstr ((char *)tc_strings[i].tc_var, bp);
 #  else
     *(tc_strings[i].tc_value) = tgetstr (tc_strings[i].tc_var, bp);

--- 1.6/sql/sql_bitmap.h	2004-05-27 15:54:33 +02:00
+++ 1.7/sql/sql_bitmap.h	2005-05-05 09:11:39 +02:00
@@ -91,7 +91,7 @@
   ulonglong map;
 public:
   Bitmap<64>() { }
-#if defined(__NETWARE__)
+#if defined(__NETWARE__) || defined(__MWERKS__)
   /*
     Metwork compiler gives error on Bitmap<64>
     Changed to Bitmap, since in this case also it will proper construct

--- 1.3/cmd-line-utils/libedit/config.h	2004-08-31 15:28:58 +02:00
+++ 1.4/cmd-line-utils/libedit/config.h	2005-05-05 09:11:39 +02:00
@@ -2,8 +2,10 @@
 #include "my_config.h"
 #include "sys.h"
 
+#if defined(LIBC_SCCS) && !defined(lint)
 #define __RCSID(x)
 #define __COPYRIGHT(x)
+#endif
 #define __RENAME(x)
 #define _DIAGASSERT(x)