Commit 23696c90 authored by unknown's avatar unknown
Browse files

Merge dli@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb-bj 

into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-ndb-bj


BitKeeper/deleted/.del-bug20328.result~4fee68989442c2a3:
  Auto merged
BitKeeper/deleted/.del-bug20328.test~c76d766fe3e1eb5:
  Auto merged
mysql-test/r/ctype_cp1250_ch.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_cp1250_ch.test:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
storage/myisam/mi_unique.c:
  Auto merged
parents 393179b6 06733a24

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"

BUILD/compile-dist

+0 −2
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)
@@ -52,7 +51,6 @@ fi 
  --with-csv-storage-engine \

  --with-example-storage-engine \

  --with-federated-storage-engine \

  --with-berkeley-db \

  --with-innodb \

  --with-ssl \

  --enable-thread-safe-client \