Commit fcb48236 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-push


sql/ha_ndbcluster.cc:
  Auto merged
parents 6708dbdb a2df1eb8

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -1117,3 +1117,5 @@ vio/test-sslclient 
vio/test-sslserver

vio/viotest-ssl

ndb/src/dummy.cpp

innobase/mkinstalldirs

mkinstalldirs

BUILD/SETUP.sh

+3 −4
Original line number Diff line number Diff line
@@ -48,10 +48,9 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch 
c_warnings="$global_warnings -Wunused"

cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"



base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-big-tables"

max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-raid --with-openssl --with-raid --with-embedded-server --with-big-tables"

max_no_es_configs="$max_leave_isam_configs --without-isam"

max_configs="$max_no_es_configs --with-embedded-server"

base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine"

max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-openssl --with-embedded-server --with-big-tables"

max_configs="$base_max_configs --with-embedded-server"



path=`dirname $0`

. "$path/check-cpu"

BUILD/autorun.sh

+13 −7
Original line number Diff line number Diff line 
#!/bin/sh

# Create MySQL autotools infrastructure



aclocal    || (echo "Can't execute aclocal" && exit 1)

autoheader || (echo "Can't execute autoheader" && exit 1)

die() { echo "$@"; exit 1; }



aclocal || die "Can't execute aclocal" 

autoheader || die "Can't execute autoheader"

# --force means overwrite ltmain.sh script if it already exists 

libtoolize --automake --force \

           || (echo "Can't execute libtoolize" && exit 1)

# Added glibtoolize reference to make native OSX autotools work

if [ -f /usr/bin/glibtoolize ] ; then

  glibtoolize --automake --force || die "Can't execute glibtoolize"

else

  libtoolize --automake --force || die "Can't execute libtoolize"

fi

  

# --add-missing instructs automake to install missing auxiliary files

# and --force to overwrite them if they already exist

automake --add-missing --force \

           || (echo "Can't execute automake" && exit 1)

autoconf   || (echo "Can't execute autoconf" && exit 1)

automake --add-missing --force || die "Can't execute automake"

autoconf || die "Can't execute autoconf"

(cd bdb/dist && sh s_all)

(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)

BUILD/compile-pentium-debug-max-no-embedded

+1 −1
Original line number Diff line number Diff line
@@ -6,6 +6,6 @@ path=`dirname $0` 
extra_flags="$pentium_cflags $debug_cflags $max_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs $max_no_es_configs"

extra_configs="$pentium_configs $debug_configs $base_max_configs"



. "$path/FINISH.sh"

VC++Files/client/mysqlclient.dsp

+0 −4
Original line number Diff line number Diff line
@@ -451,10 +451,6 @@ SOURCE=..\mysys\my_symlink2.c 
# End Source File

# Begin Source File



SOURCE=..\mysys\my_tempnam.c

# End Source File

# Begin Source File



SOURCE=..\libmysql\my_time.c

# End Source File

# Begin Source File