Commit f0846e3c authored by unknown's avatar unknown

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


BUILD/Makefile.am:
  Auto merged
parents d7175dee 362c8533
...@@ -21,14 +21,22 @@ EXTRA_DIST = FINISH.sh \ ...@@ -21,14 +21,22 @@ EXTRA_DIST = FINISH.sh \
SETUP.sh \ SETUP.sh \
autorun.sh \ autorun.sh \
check-cpu \ check-cpu \
cleanup \
compile-alpha \ compile-alpha \
compile-alpha-ccc \ compile-alpha-ccc \
compile-alpha-cxx \ compile-alpha-cxx \
compile-alpha-debug \ compile-alpha-debug \
compile-amd64-debug-max \
compile-amd64-max \
compile-darwin-mwcc \
compile-dist \
compile-hpux11-parisc2-aCC \
compile-ia64-debug-max \ compile-ia64-debug-max \
compile-irix-mips64-mipspro \
compile-pentium \ compile-pentium \
compile-pentium-debug \ compile-pentium-debug \
compile-pentium-debug-max \ compile-pentium-debug-max \
compile-pentium-debug-max-no-embedded \
compile-pentium-debug-no-bdb \ compile-pentium-debug-no-bdb \
compile-pentium-debug-openssl \ compile-pentium-debug-openssl \
compile-pentium-debug-yassl \ compile-pentium-debug-yassl \
...@@ -38,10 +46,16 @@ EXTRA_DIST = FINISH.sh \ ...@@ -38,10 +46,16 @@ EXTRA_DIST = FINISH.sh \
compile-pentium-myodbc \ compile-pentium-myodbc \
compile-pentium-mysqlfs-debug \ compile-pentium-mysqlfs-debug \
compile-pentium-pgcc \ compile-pentium-pgcc \
compile-pentium-valgrind-max \
compile-pentium64-debug \
compile-pentium64-debug-max \
compile-pentium64-valgrind-max \
compile-ppc \
compile-ppc-debug \
compile-ppc-debug-max \
compile-ppc-max \
compile-solaris-sparc \ compile-solaris-sparc \
compile-solaris-sparc-debug \ compile-solaris-sparc-debug \
compile-irix-mips64-mipspro \
compile-hpux11-parisc2-aCC \
compile-solaris-sparc-forte \ compile-solaris-sparc-forte \
compile-solaris-sparc-purify compile-solaris-sparc-purify
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment