Commit afbb97ba authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


BitKeeper/etc/logging_ok:
  auto-union
sql/item.cc:
  Auto merged
parents 9f8a30f5 d3d956c0

BUILD/FINISH.sh

+0 −6
Original line number Diff line number Diff line
@@ -2,12 +2,6 @@ cflags="$c_warnings $extra_flags" 
cxxflags="$cxx_warnings $base_cxxflags $extra_flags"

extra_configs="$extra_configs $local_infile_configs"

configure="./configure $base_configs $extra_configs"

for arg

do

  # Escape special characters so they don't confuse eval

  configure="$configure "`echo "$arg" | \

  		sed -e 's,\([^a-zA-Z0-9_.=-]\),\\\\\1,g'`

done



commands="\

$make -k distclean || true

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"

BUILD/compile-dist

+5 −0
Original line number Diff line number Diff line
@@ -18,12 +18,17 @@ autoconf 
# Default to gcc for CC and CXX

if test -z "$CXX" ; then

  export CXX=gcc

  # Set some required compile options

  if test -z "$CXXFLAGS" ; then

    export CXXFLAGS="-felide-constructors -fno-exceptions -fno-rtti"

  fi

fi



if test -z "$CC" ; then

  export CC=gcc

fi





# Use ccache, if available

if ccache -V > /dev/null 2>&1

then

BitKeeper/etc/logging_ok

+7 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ hf@bisonxp.(none) 
hf@deer.(none)

hf@deer.mysql.r18.ru

hf@genie.(none)

holyfoot@mysql.com

igor@hundin.mysql.fi

igor@linux.local

igor@rurik.mysql.com
@@ -97,6 +98,7 @@ jani@dsl-jkl1657.dial.inet.fi 
jani@dsl-kpogw4gb5.dial.inet.fi

jani@hynda.(none)

jani@hynda.mysql.fi

jani@ibmlab.site

jani@janikt.pp.saunalahti.fi

jani@linux.local

jani@rhols221.adsl.netsonic.fi
@@ -113,6 +115,7 @@ jcole@sarvik.tfr.cafe.ee 
jcole@tetra.spaceapes.com

jimw@mysql.com

joerg@mysql.com

joerg@trift-lap.fambruehe

jon@gigan.

jonas@mysql.com

joreland@bk-internal.mysql.com
@@ -178,6 +181,7 @@ mwagner@cash.mwagner.org 
mwagner@evoq.mwagner.org

mwagner@here.mwagner.org

mwagner@mysql.com

mwagner@ultrafly.mysql.com

mwagner@work.mysql.com

mydev@mysql.com

mysql@home.(none)
@@ -221,9 +225,11 @@ ram@deer.(none) 
ram@gw.mysql.r18.ru

ram@gw.udmsearch.izhnet.ru

ram@mysql.r18.ru

ram@ram-book.(none)

ram@ram.(none)

ramil@mysql.com

ranger@regul.home.lan

rburnett@bk-internal.mysql.com

rburnett@build.mysql.com

reggie@bob.(none)

reggie@mdk10.(none)
@@ -244,6 +250,7 @@ serg@serg.mysql.com 
serg@sergbook.mylan

serg@sergbook.mysql.com

sergefp@mysql.com

shuichi@mysql.com

sinisa@rhols221.adsl.netsonic.fi

stewart@mysql.com

svoj@mysql.com

client/client_priv.h

+3 −3
Original line number Diff line number Diff line
@@ -45,9 +45,9 @@ enum options_client 
  OPT_COMPATIBLE, OPT_RECONNECT, OPT_DELIMITER, OPT_SECURE_AUTH,

  OPT_OPEN_FILES_LIMIT, OPT_SET_CHARSET, OPT_CREATE_OPTIONS,

  OPT_START_POSITION, OPT_STOP_POSITION, OPT_START_DATETIME, OPT_STOP_DATETIME,

  OPT_SIGINT_IGNORE, OPT_HEXBLOB, OPT_ORDER_BY_PRIMARY

  OPT_SIGINT_IGNORE, OPT_HEXBLOB, OPT_ORDER_BY_PRIMARY, OPT_COUNT,

#ifdef HAVE_NDBCLUSTER_DB

  ,OPT_NDBCLUSTER,OPT_NDB_CONNECTSTRING

  OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING,

#endif

  ,OPT_IGNORE_TABLE

  OPT_IGNORE_TABLE

};