Commit b300d560 authored by unknown's avatar unknown
Browse files

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

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


sql/item_func.h:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents d7c7f5a9 43dbfa66

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -943,6 +943,7 @@ ndb/src/common/mgmcommon/printConfig/*.d 
ndb/src/common/portlib/libportlib.dsp

ndb/src/common/transporter/libtransporter.dsp

ndb/src/common/util/libgeneral.dsp

ndb/src/common/util/testBitmask.cpp

ndb/src/cw/cpcd/ndb_cpcd

ndb/src/dummy.cpp

ndb/src/kernel/blocks/backup/libbackup.dsp

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/Makefile.am

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ EXTRA_DIST = FINISH.sh \ 
			compile-pentium-debug-max \

			compile-pentium-debug-max-no-embedded \

			compile-pentium-debug-max-no-ndb \

			compile-pentium-debug-no-bdb \

			compile-pentium-debug-openssl \

			compile-pentium-debug-yassl \

			compile-pentium-gcov \

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"