Commit dadbb4ca authored by unknown's avatar unknown

Merge trift2.:/MySQL/M50/bug34291-5.0

into  trift2.:/MySQL/M51/bug34291-5.1


BUILD/Makefile.am:
  Auto merged
parents 6dad5e90 d4e5ae56
...@@ -27,6 +27,8 @@ EXTRA_DIST = FINISH.sh \ ...@@ -27,6 +27,8 @@ EXTRA_DIST = FINISH.sh \
compile-alpha-cxx \ compile-alpha-cxx \
compile-alpha-debug \ compile-alpha-debug \
compile-amd64-debug-max \ compile-amd64-debug-max \
compile-amd64-gcov \
compile-amd64-gprof \
compile-amd64-max \ compile-amd64-max \
compile-amd64-max-sci \ compile-amd64-max-sci \
compile-darwin-mwcc \ compile-darwin-mwcc \
...@@ -53,6 +55,8 @@ EXTRA_DIST = FINISH.sh \ ...@@ -53,6 +55,8 @@ EXTRA_DIST = FINISH.sh \
compile-pentium-valgrind-max \ compile-pentium-valgrind-max \
compile-pentium64-debug \ compile-pentium64-debug \
compile-pentium64-debug-max \ compile-pentium64-debug-max \
compile-pentium64-gcov \
compile-pentium64-gprof \
compile-pentium64-max-sci \ compile-pentium64-max-sci \
compile-pentium64-valgrind-max \ compile-pentium64-valgrind-max \
compile-ppc \ compile-ppc \
...@@ -60,6 +64,10 @@ EXTRA_DIST = FINISH.sh \ ...@@ -60,6 +64,10 @@ EXTRA_DIST = FINISH.sh \
compile-ppc-debug-max \ compile-ppc-debug-max \
compile-ppc-debug-max-no-ndb \ compile-ppc-debug-max-no-ndb \
compile-ppc-max \ compile-ppc-max \
compile-solaris-amd64 \
compile-solaris-amd64-debug \
compile-solaris-amd64-forte \
compile-solaris-amd64-forte-debug \
compile-solaris-sparc \ compile-solaris-sparc \
compile-solaris-sparc-debug \ compile-solaris-sparc-debug \
compile-solaris-sparc-forte \ compile-solaris-sparc-forte \
......
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