Commit 626abed3 authored by unknown's avatar unknown
Browse files

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
parents b49b1585 cca25e4d

BUILD/SETUP.sh

100644 → 100755
+12 −6
Original line number Diff line number Diff line
@@ -6,12 +6,15 @@ then 
  exit 1

fi



prefix_configs="--prefix=/usr/local/mysql"

just_print=

just_configure=

full_debug=

while test $# -gt 0

do

  case "$1" in

  --prefix=* ) prefix_configs="$1"; shift ;;

  --with-debug=full ) full_debug="=full"; shift ;;

  -c | --just-configure ) just_configure=1; shift ;;

  -n | --just-print | --print ) just_print=1; shift ;;

  -h | --help ) cat <<EOF; exit 0 ;;
@@ -19,13 +22,15 @@ Usage: $0 [-h|-n] [configure-options] 
  -h, --help              Show this help message.

  -n, --just-print        Don't actually run any commands; just print them.

  -c, --just-configure    Stop after running configure.



Any other options will be passed directly to configure.

  --with-debug=full       Build with full debug.

  --prefix=path           Build with prefix 'path'.



Note:  this script is intended for internal use by MySQL developers.

EOF

  --with-debug=full ) full_debug="=full"; shift ;;

  * ) break ;;

  * )

    echo "Unknown option '$1'"

    exit 1

    break ;;

  esac

done
@@ -62,11 +67,12 @@ fast_cflags="-O3 -fno-omit-frame-pointer" 
reckless_cflags="-O3 -fomit-frame-pointer "



debug_cflags="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DPEDANTIC_SAFEMALLOC -DSAFE_MUTEX"

debug_extra_cflags="-O1 -Wuninitialized"



base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"

amd64_cxxflags="-DBIG_TABLES"



base_configs="--prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-readline"

base_configs="$prefix_configs --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-readline"

static_link="--with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static"

amd64_configs=""

alpha_configs=""	# Not used yet
@@ -80,7 +86,7 @@ local_infile_configs="--enable-local-infile" 
debug_configs="--with-debug$full_debug"

if [ -z "$full_debug" ]

then

	debug_cflags="$debug_cflags -O1 -Wuninitialized"

  debug_cflags="$debug_cflags $debug_extra_cflags"

fi



if gmake --version > /dev/null 2>&1

BUILD/compile-pentium64-debug

+1 −1
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"

. "$path/SETUP.sh" $@ --with-debug=full



extra_flags="$pentium64_cflags $debug_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ nick@nick.leippe.com 
papa@gbichot.local

patg@krsna.patg.net

patg@patrick-galbraiths-computer.local

patg@pc248.lfp.kcls.org

paul@central.snake.net

paul@frost.snake.net

paul@ice.local

VC++Files/client/mysqltest.dsp

+6 −6
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ RSC=rc.exe 
# PROP Output_Dir ".\debug"

# PROP Intermediate_Dir ".\debug"

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MTd /I "../include" /I "../regex" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_WINDOWS" /D "_MBCS" /Fp".\debug/mysqltest.pch" /Fo".\debug/" /Fd".\debug/" /GZ /c /GX 

# ADD CPP /nologo /MTd /I "../include" /I "../regex" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_WINDOWS" /D "_MBCS" /Fp".\debug/mysqltest.pch" /Fo".\debug/" /Fd".\debug/" /GZ /c /GX 

# ADD BASE CPP /nologo /MTd /I "../extra" /I "../include" /I "../regex" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_WINDOWS" /D "_MBCS" /Fp".\debug/mysqltest.pch" /Fo".\debug/" /Fd".\debug/" /GZ /c /GX 

# ADD CPP /nologo /MTd /I "../extra" /I "../include" /I "../regex" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_WINDOWS" /D "_MBCS" /Fp".\debug/mysqltest.pch" /Fo".\debug/" /Fd".\debug/" /GZ /c /GX 

# ADD BASE MTL /nologo /tlb".\debug\mysqltest.tlb" /win32 

# ADD MTL /nologo /tlb".\debug\mysqltest.tlb" /win32 

# ADD BASE RSC /l 1033 /d "_DEBUG"
@@ -67,8 +67,8 @@ LINK32=link.exe 
# PROP Output_Dir ".\classic"

# PROP Intermediate_Dir ".\classic"

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MT /I "../include" /I "../regex" /I "../" /W3 /Ob1 /G6 /D "_CONSOLE" /D "_WINDOWS" /D "LICENSE=Commercial" /D "DBUG_OFF" /D "NDEBUG" /D "_MBCS" /GF /Gy /Fp".\classic/mysqltest.pch" /Fo".\classic/" /Fd".\classic/" /c /GX 

# ADD CPP /nologo /MT /I "../include" /I "../regex" /I "../" /W3 /Ob1 /G6 /D "_CONSOLE" /D "_WINDOWS" /D "LICENSE=Commercial" /D "DBUG_OFF" /D "NDEBUG" /D "_MBCS" /GF /Gy /Fp".\classic/mysqltest.pch" /Fo".\classic/" /Fd".\classic/" /c /GX 

# ADD BASE CPP /nologo /MT /I "../extra" /I "../include" /I "../regex" /I "../" /W3 /Ob1 /G6 /D "_CONSOLE" /D "_WINDOWS" /D "LICENSE=Commercial" /D "DBUG_OFF" /D "NDEBUG" /D "_MBCS" /GF /Gy /Fp".\classic/mysqltest.pch" /Fo".\classic/" /Fd".\classic/" /c /GX 

# ADD CPP /nologo /MT /I "../extra" /I "../include" /I "../regex" /I "../" /W3 /Ob1 /G6 /D "_CONSOLE" /D "_WINDOWS" /D "LICENSE=Commercial" /D "DBUG_OFF" /D "NDEBUG" /D "_MBCS" /GF /Gy /Fp".\classic/mysqltest.pch" /Fo".\classic/" /Fd".\classic/" /c /GX 

# ADD BASE MTL /nologo /tlb".\classic\mysqltest.tlb" /win32 

# ADD MTL /nologo /tlb".\classic\mysqltest.tlb" /win32 

# ADD BASE RSC /l 1033 /d "NDEBUG"
@@ -92,8 +92,8 @@ LINK32=link.exe 
# PROP Output_Dir ".\release"

# PROP Intermediate_Dir ".\release"

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MT /I "../include" /I "../regex" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_CONSOLE" /D "_WINDOWS" /D "NDEBUG" /D "_MBCS" /GF /Gy /Fp".\release/mysqltest.pch" /Fo".\release/" /Fd".\release/" /c /GX 

# ADD CPP /nologo /MT /I "../include" /I "../regex" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_CONSOLE" /D "_WINDOWS" /D "NDEBUG" /D "_MBCS" /GF /Gy /Fp".\release/mysqltest.pch" /Fo".\release/" /Fd".\release/" /c /GX 

# ADD BASE CPP /nologo /MT /I "../extra" /I "../include" /I "../regex" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_CONSOLE" /D "_WINDOWS" /D "NDEBUG" /D "_MBCS" /GF /Gy /Fp".\release/mysqltest.pch" /Fo".\release/" /Fd".\release/" /c /GX 

# ADD CPP /nologo /MT /I "../extra" /I "../include" /I "../regex" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_CONSOLE" /D "_WINDOWS" /D "NDEBUG" /D "_MBCS" /GF /Gy /Fp".\release/mysqltest.pch" /Fo".\release/" /Fd".\release/" /c /GX 

# ADD BASE MTL /nologo /tlb".\release\mysqltest.tlb" /win32 

# ADD MTL /nologo /tlb".\release\mysqltest.tlb" /win32 

# ADD BASE RSC /l 1033 /d "NDEBUG"

configure.in

+3 −3
Original line number Diff line number Diff line
@@ -1678,12 +1678,12 @@ if test "$with_debug" = "yes" 
then

  # Medium debug.

  CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DDBUG_ON -DSAFE_MUTEX $CFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DDBUG_ON -DSAFE_MUTEX $CXXFLAGS"

elif test "$with_debug" = "full"

then

  # Full debug. Very slow in some cases

  CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"

  CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC -DUNIV_DEBUG $CFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC -DUNIV_DEBUG $CXXFLAGS"

else

  # Optimized version. No debug

  CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS"