Commit bfa81464 authored by unknown's avatar unknown
Browse files

Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt 

into  dator5.(none):/home/pappa/bug21388


sql/ha_partition.cc:
  Auto merged
sql/ha_partition.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
parents 13133087 c752d7db

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"