Commit 889fa8ae authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-ndb 

into neptunus.(none):/home/msvensson/mysql/bug9626


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
parents 76fbe88b cd1d988b

.bzrignore

+5 −0
Original line number Diff line number Diff line
@@ -1110,3 +1110,8 @@ VC++Files/client/mysql_amd64.dsp 
client/mysqltestmanager-pwgen

client/mysqltestmanagerc

tools/mysqltestmanager

config.guess

config.sub

install-sh

ltmain.sh

missing

BUILD/FINISH.sh

+3 −11
Original line number Diff line number Diff line
@@ -7,17 +7,9 @@ commands="\ 
$make -k distclean || true 

/bin/rm -rf */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache bdb/dist/autom4te.cache autom4te.cache innobase/autom4te.cache;



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

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

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

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

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

(cd bdb/dist && sh s_all)

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

if [ -d gemini ]

then

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

fi"



path=`dirname $0`

. \"$path/autorun.sh\""



if [ -z "$just_clean" ]

then

BUILD/autorun.sh

0 → 100755
+15 −0
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)

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

libtoolize --automake --force \

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

# --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)

(cd bdb/dist && sh s_all)

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

BUILD/compile-alpha-ccc

+3 −1
Original line number Diff line number Diff line
@@ -2,7 +2,9 @@ 
make -k clean

/bin/rm -f */.deps/*.P */*.o

/bin/rm -f config.cache mysql-*.tar.gz

aclocal; autoheader; aclocal; automake; autoconf



path=`dirname $0`

. "$path/autorun.sh"



CC=ccc CFLAGS="-fast -O3 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O6 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti -mcpu=ev6 -Wa,-mev6" CXXLDFLAGS='/usr/lib/compaq/libots-2.2.7/libots.so /usr/lib/compaq/cpml-5.0.0/libcpml_ev6.a' ./configure --prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex --enable-thread-safe-client

make

BUILD/compile-alpha-cxx

+3 −1
Original line number Diff line number Diff line
@@ -2,7 +2,9 @@ 
make -k clean

/bin/rm -f */.deps/*.P */*.o

/bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache mysql-*.tar.gz

aclocal; autoheader; aclocal; automake; autoconf



path=`dirname $0`

. "$path/autorun.sh"



CC=ccc CFLAGS="-fast" CXX=cxx CXXFLAGS="-fast -noexceptions -nortti" ./configure --prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-non_shared --with-client-ldflags=-non_shared --without-extra-tools --disable-dependency-tracking