Commit aa80c3a4 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/mysql-test-run.sh:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents 130f14db 6748f7f4

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/check-cpu

+29 −0
Original line number Diff line number Diff line
@@ -19,8 +19,23 @@ if test -r /proc/cpuinfo ; then 
  if test -z "$model_name" ; then

    model_name=`uname -m`

  fi

else

  # Fallback when there is no /proc/cpuinfo

  case "`uname -s`" in

    FreeBSD)

      cpu_family=`uname -m`;

      model_name=`sysctl -b hw.model`

      ;;

    *)

      cpu_family=`uname -m`;

      model_name="unknown";

      ;;

  esac

fi



cpu_flag=""

cpu_flag_old=""



case "$cpu_family--$model_name" in

  Alpha*EV6*)

    cpu_flag="ev6";
@@ -28,11 +43,21 @@ case "$cpu_family--$model_name" in 
  *Xeon*)

    cpu_flag="nocona";

    ;;

  *Pentium*4*Mobile*CPU*)

    cpu_flag="pentium4m";

  ;;

  *Pentium*4*CPU*)

    cpu_flag="pentium4";

    ;;

  *Pentium*III*Mobile*CPU*)

    cpu_flag="pentium3m";

  ;;

  *Pentium*III*CPU*)

    cpu_flag="pentium3";

  ;;

  *Athlon*64*)

    cpu_flag="athlon64";

    cpu_flag_old="athlon";

    ;;

  *Athlon*)

    cpu_flag="athlon";
@@ -72,6 +97,10 @@ case "$cc_ver--$cc_verno" in 
    check_cpu_cflags="-mtune=$cpu_flag -march=$cpu_flag"

    ;;

  *GCC*)

    # Fix for older compiler versions

    if test -n "$cpu_flag_old"; then

      cpu_flag="$cpu_flag_old"

    fi

    check_cpu_cflags="-mcpu=$cpu_flag -march=$cpu_flag"

    ;;

  *)

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

+8 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ ahlentz@co3064164-a.rochd1.qld.optusnet.com.au 
akishkin@work.mysql.com

anjuta@arthur.local

antony@ltantony.dsl-verizon.net

antony@ltantony.mysql.com

antony@ltantony.rdg.cyberkinetica.com

antony@ltantony.rdg.cyberkinetica.homeunix.net

arjen@bitbike.com
@@ -82,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
@@ -96,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
@@ -112,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
@@ -177,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)
@@ -219,9 +224,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)
@@ -242,6 +249,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