Commit 7f338097 authored by unknown's avatar unknown
Browse files

Manual merge 


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ndb_restore.test:
  Auto merged
ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
parents a001bb2b c758512a

BUILD/compile-darwin-mwcc

0 → 100755
+54 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



c_warnings=""

cxx_warnings=""

fast_cflags="-O3"

base_cxxflags="-fno-handle-exceptions"



# FIXME do we need to link static, not to depend on CodeWarrior libs?



if [ x$MODE = x ] ; then

  echo "You need to give an argument, 'standard', 'max', 'debug' or 'debug-max'"

  echo "Like: MODE=standard BUILD/compile-darwin-codewarrior"

  exit 1

else

  case $MODE in

    standard|pro-gpl)

      # FIXME pro/pro-gpl different libedit/readline

      extra_flags="$ppc_cflags $fast_cflags"

      ;;

    pro)

      # FIXME pro/pro-gpl different libedit/readline

      extra_flags="$ppc_cflags $fast_cflags"

      extra_configs="--with-libedit"

      ;;

    max)

      extra_flags="$ppc_cflags $fast_cflags"

      extra_configs="$max_configs"

      ;;

    debug)

      extra_flags="$ppc_cflags $debug_cflags"

      c_warnings="$c_warnings $debug_extra_warnings"

      cxx_warnings="$cxx_warnings $debug_extra_warnings"

      extra_configs="$debug_configs"

      ;;

    debug-max)

      extra_flags="$ppc_cflags $debug_cflags $max_cflags"

      c_warnings="$c_warnings $debug_extra_warnings"

      cxx_warnings="$cxx_warnings $debug_extra_warnings"

      extra_configs="$debug_configs $max_configs"

      ;;

    *)

      echo "You need to give an argument, 'standard', 'max', 'debug' or 'debug-max'"

      echo "Like: MODE=standard BUILD/compile-darwin-codewarrior"

      exit 1

      ;;

  esac

fi



extra_configs="$extra_configs --with-darwin-mwcc"



. "$path/FINISH.sh"

BitKeeper/etc/logging_ok

+2 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ mysqldev@build.mysql2.com 
mysqldev@melody.local

mysqldev@mysql.com

mysqldev@o2k.irixworld.net

ndbdev@dl145b.mysql.com

ndbdev@eel.hemma.oreland.se

ndbdev@ndbmaster.mysql.com

ndbdev@shark.
@@ -268,6 +269,7 @@ tonu@x153.internalnet 
tonu@x3.internalnet

tsmith@build.mysql.com

tulin@build.mysql.com

tulin@dl145b.mysql.com

tulin@mysql.com

ulli@morbus.(none)

venu@hundin.mysql.fi

cmd-line-utils/libedit/config.h

+2 −0
Original line number Diff line number Diff line
@@ -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)

cmd-line-utils/readline/terminal.c

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ get_term_capabilities (bp) 
  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);

configure.in

+21 −2
Original line number Diff line number Diff line
@@ -123,8 +123,25 @@ AM_SANITY_CHECK 
# This is needed is SUBDIRS is set

AC_PROG_MAKE_SET



# 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
@@ -144,6 +161,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

# C_EXTRA_FLAGS are flags that are automaticly added to both