Commit 239c28be authored by unknown's avatar unknown
Browse files

Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1 

into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb


sql/sql_show.cc:
  Auto merged
parents e60c02f7 1b6858ea

BUILD/FINISH.sh

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ configure="./configure $base_configs $extra_configs" 


commands="\

$make -k distclean || true 

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

/bin/rm -rf */.deps/*.P config.cache storage/innobase/config.cache autom4te.cache innobase/autom4te.cache;



path=`dirname $0`

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

BUILD/compile-alpha-cxx

+1 −1
Original line number Diff line number Diff line 
/bin/rm -f */.deps/*.P */*.o

make -k clean

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

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

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



path=`dirname $0`

. "$path/autorun.sh"

BUILD/compile-alpha-debug

+1 −1
Original line number Diff line number Diff line 
/bin/rm -f */.deps/*.P */*.o

make -k clean

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

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

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



path=`dirname $0`

. "$path/autorun.sh"

BUILD/compile-dist

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
# package" that is used as the basis for all other binary builds.

#

test -f Makefile && make distclean

(cd storage/bdb/dist && sh s_all)

(cd storage/innobase && aclocal && autoheader && \

    libtoolize --automake --force --copy && \

    automake --force --add-missing --copy && autoconf)

BUILD/compile-ia64-debug-max

+1 −1
Original line number Diff line number Diff line 
gmake -k clean || true 

/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache storage/bdb/build_unix/config.cache

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



path=`dirname $0`

. "$path/autorun.sh"