mariadb/BUILD
unknown 1f07de22e0 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
2007-05-07 15:39:36 +02:00
..
.cvsignore
autorun.sh
check-cpu
cleanup
compile-alpha
compile-alpha-ccc
compile-alpha-cxx
compile-alpha-debug
compile-amd64-debug-max
compile-amd64-debug-max-no-ndb
compile-amd64-max
compile-amd64-max-sci
compile-amd64-valgrind-max
compile-darwin-mwcc
compile-dist
compile-hpux11-parisc2-aCC
compile-ia64-debug-max
compile-irix-mips64-mipspro
compile-ndb-autotest
compile-pentium
compile-pentium-cybozu
compile-pentium-debug
compile-pentium-debug-max
compile-pentium-debug-max-no-embedded
compile-pentium-debug-max-no-ndb
compile-pentium-debug-openssl
compile-pentium-debug-yassl
compile-pentium-gcov
compile-pentium-gprof
compile-pentium-icc
compile-pentium-icc-valgrind-max
compile-pentium-icc-yassl
compile-pentium-max
compile-pentium-myodbc
compile-pentium-mysqlfs-debug
compile-pentium-pgcc
compile-pentium-valgrind-max
compile-pentium64
compile-pentium64-debug
compile-pentium64-debug-max
compile-pentium64-max
compile-pentium64-max-sci
compile-pentium64-valgrind-max
compile-ppc
compile-ppc-debug
compile-ppc-debug-max
compile-ppc-debug-max-no-ndb
compile-ppc-max
compile-solaris-amd64
compile-solaris-sparc
compile-solaris-sparc-debug
compile-solaris-sparc-forte
compile-solaris-sparc-purify
FINISH.sh
Makefile.am Merge mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.0-ndb 2007-05-07 15:39:36 +02:00
SETUP.sh