Commit 33466aa3 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
parents 83a00d2e d2cdceb2

scripts/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ SUFFIXES = .sh 
	  -e 's!@''IS_LINUX''@!@IS_LINUX@!' \

	  -e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \

	  -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \

	  -e "s!@MAKE@!$(MAKE)!" \

	$< > $@-t

	@CHMOD@ +x $@-t

	@MV@ $@-t $@

scripts/make_binary_distribution.sh

+2 −2
Original line number Diff line number Diff line
@@ -267,8 +267,8 @@ fi 


# NDB Cluster

if [ x$NDBCLUSTER = x1 ]; then

  ( cd ndb            ; make DESTDIR=$BASE/ndb-stage install )

  ( cd mysql-test/ndb ; make DESTDIR=$BASE/ndb-stage install )

  ( cd ndb            ; @MAKE@ DESTDIR=$BASE/ndb-stage install )

  ( cd mysql-test/ndb ; @MAKE@ DESTDIR=$BASE/ndb-stage install )

  $CP $BASE/ndb-stage@bindir@/* $BASE/bin/.

  $CP $BASE/ndb-stage@libexecdir@/* $BASE/bin/.

  $CP $BASE/ndb-stage@pkglibdir@/* $BASE/lib/.