Commit 7cbe4d19 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


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents 0eb1a810 bfe74e69

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -754,6 +754,7 @@ ndb/examples/ndbapi_example3/ndbapi_example3 
ndb/examples/ndbapi_example5/ndbapi_example5

ndb/examples/select_all/select_all

ndb/include/ndb_global.h

ndb/include/ndb_types.h

ndb/include/ndb_version.h

ndb/lib/libMGM_API.so

ndb/lib/libNDB_API.so

BUILD/compile-solaris-sparc-purify

+11 −12
Original line number Diff line number Diff line
@@ -4,10 +4,10 @@ while test $# -gt 0 
do

  case "$1" in

    --debug) EXTRA_CONFIG_FLAGS=--with-debug; shift ;;

  -h | --help ) cat <<EOF; exit 0 ;;

Usage: $0 [-h|-n] [configure-options]

  --debug		Compile with DBUG enabled

EOF

    -h | --help )

      echo "Usage: $0 [-h|-n] [configure-options]"

      echo "  --debug		Compile with DBUG enabled"

      exit 0 ;;

    *)  echo "No such option '$1'" ; exit ;;

  esac

done
@@ -15,16 +15,15 @@ done 
gmake -k clean || true 

/bin/rm -f */.deps/*.P config.cache

aclocal && autoheader && aclocal && automake && autoconf

(cd bdb/dist && sh s_all)

# (cd bdb/dist && sh s_all)

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



CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused  -DHAVE_purify -DEXTRA_DEBUG -O2" CXX=gcc CXXLD=g++ CXXFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti  -DHAVE_purify -DEXTRA_DEBUG -O2" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-berkeley-db --with-innodb $EXTRA_CONFIG_FLAGS

CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused  -DHAVE_purify -DEXTRA_DEBUG -O2" CXX=gcc CXXLD=g++ CXXFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti  -DHAVE_purify -DEXTRA_DEBUG -O2" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --without-berkeley-db --with-embedded-server --with-innodb $EXTRA_CONFIG_FLAGS



gmake -j 4



cd sql ; mv mysqld mysqld-org ;

make CXXLD="purify -best-effort g++"  mysqld ; mv mysqld mysqld-purify

make CXXLD="quantify -best-effort g++"  mysqld ; mv mysqld mysqld-quantify

make CXXLD="purecov -best-effort g++"  mysqld ; mv mysqld mysqld-purecov

gmake CXXLD="purify -best-effort g++"  mysqld ; mv mysqld mysqld-purify

gmake CXXLD="quantify -best-effort g++"  mysqld ; mv mysqld mysqld-quantify

gmake CXXLD="purecov -best-effort g++"  mysqld ; mv mysqld mysqld-purecov

mv mysqld-org mysqld

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ ram@mysql.r18.ru 
ram@ram.(none)

ranger@regul.home.lan

rburnett@build.mysql.com

reggie@bob.(none)

root@home.(none)

root@mc04.(none)

root@x3.internalnet

Build-tools/Do-compile

+2 −1
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ if ($opt_stage <= 1) 
  $opt_config_options.= " --with-zlib-dir=bundled" if ($opt_bundled_zlib);

  $opt_config_options.= " --with-client-ldflags=-all-static" if ($opt_static_client);

  $opt_config_options.= " --with-debug" if ($opt_with_debug);

  $opt_config_options.= " --without-ndb-debug" if ($opt_with_debug && $opt_with_cluster);

  $opt_config_options.= " --with-libwrap" if ($opt_libwrap);

  $opt_config_options.= " --with-low-memory" if ($opt_with_low_memory);

  $opt_config_options.= " --with-mysqld-ldflags=-all-static" if ($opt_static_server);

Build-tools/Do-pkg

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ $BUILDDIR= "$PWD/$HOST"; 
$PREFPANE= "$PWD/mysql-administrator/source/mac/PreferencePane/build/MySQL.prefPane";

$SRCBASEDIR= <$BUILDDIR/mysql*-$VERSION>;

$SUPFILEDIR= <$SRCBASEDIR/support-files/MacOSX>;

$TAR= <$BUILDDIR/$NAME-apple-darwin*-powerpc.tar.gz>;

$TAR= <$BUILDDIR/$NAME-apple-darwin*-powerpc*.tar.gz>;

$TAR =~ /.*\/$NAME(.*)\.tar\.gz$/;

$ARCH= $1;

$NAME= $NAME . $ARCH;