diff options
| author | unknown <mikron@mikael-ronstr-ms-dator.local> | 2007-05-07 15:39:36 +0200 |
|---|---|---|
| committer | unknown <mikron@mikael-ronstr-ms-dator.local> | 2007-05-07 15:39:36 +0200 |
| commit | 1f07de22e097c6e32b29042ba45c66b2293ce952 (patch) | |
| tree | 74e4d9d386e521284ecc05b8002379d9056c7a82 /BUILD/Makefile.am | |
| parent | a33d5e1755c9b6dc6839632240adf3454fa959f8 (diff) | |
| parent | b95356601151b10a695b5b9a44bd49ddeac7e433 (diff) | |
| download | mariadb-git-1f07de22e097c6e32b29042ba45c66b2293ce952.tar.gz | |
Merge mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.0-ndb
into mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.1-ndb
BUILD/Makefile.am:
Auto merged
config/ac-macros/ha_ndbcluster.m4:
Auto merged
storage/ndb/src/common/transporter/SCI_Transporter.cpp:
Auto merged
storage/ndb/src/common/transporter/SCI_Transporter.hpp:
Auto merged
libmysqld/Makefile.am:
Manual merge
libmysqld/examples/Makefile.am:
Manual merge
Diffstat (limited to 'BUILD/Makefile.am')
| -rw-r--r-- | BUILD/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/BUILD/Makefile.am b/BUILD/Makefile.am index 46814a077de..82e31c4a47b 100644 --- a/BUILD/Makefile.am +++ b/BUILD/Makefile.am @@ -28,6 +28,7 @@ EXTRA_DIST = FINISH.sh \ compile-alpha-debug \ compile-amd64-debug-max \ compile-amd64-max \ + compile-amd64-max-sci \ compile-darwin-mwcc \ compile-dist \ compile-hpux11-parisc2-aCC \ @@ -52,6 +53,7 @@ EXTRA_DIST = FINISH.sh \ compile-pentium-valgrind-max \ compile-pentium64-debug \ compile-pentium64-debug-max \ + compile-pentium64-max-sci \ compile-pentium64-valgrind-max \ compile-ppc \ compile-ppc-debug \ |