ndb in mysql-test fix

mysql-test/Makefile.am

@@ -17,6 +17,8 @@
 
 ## Process this file with automake to create Makefile.in
 
+SUBDIRS = ndb
+
 benchdir_root=		$(prefix)
 testdir =	        $(benchdir_root)/mysql-test
 EXTRA_SCRIPTS = 	mysql-test-run.sh install_test_db.sh

mysql-test/ndb/install_ndbcluster.sh

@@ -13,16 +13,16 @@ fsdir=`pwd`
 
 if [ -d ../sql ] ; then
    SOURCE_DIST=1
-   ndbtop=../ndb
+   ndbtop=`pwd`/../ndb
    exec_ndb=$ndbtop/src/kernel/ndb-main/ndb
    exec_mgmtsrvr=$ndbtop/src/mgmsrv/mgmtsrvr
-   exec_waiter=$ndbtop/tools/ndbwaiter
+   exec_waiter=$ndbtop/tools/ndb_waiter
    exec_mgmtclient=$ndbtop/src/mgmclient/mgmtclient
 else
    BINARY_DIST=1
    exec_ndb=@ndbbindir@/ndb
    exec_mgmtsrvr=@ndbbindir@/mgmtsrvr
-   exec_waiter=@ndbtoolsdir@/waiter
+   exec_waiter=@ndbtoolsdir@/ndb_waiter
    exec_mgmtclient=@ndbbindir@/mgmtclient
 fi
 

mysql-test/ndb/stop_ndbcluster.sh

@@ -6,7 +6,7 @@
 
 if [ -d ../sql ] ; then
    SOURCE_DIST=1
-   ndbtop=../ndb
+   ndbtop=`pwd`/../ndb
    exec_mgmtclient=$ndbtop/src/mgmclient/mgmtclient
 else
    BINARY_DIST=1