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

into ndbmaster.mysql.com:/ndb/clone-mysql-4.1-ndb-daily-2004-09-08

ndb/test/run-test/Makefile.am

@@ -18,5 +18,8 @@ LDADD_LOC = $(top_builddir)/ndb/src/mgmclient/CpcClient.o \
             $(top_builddir)/mysys/libmysys.a \
             $(top_builddir)/strings/libmystrings.a
 
+wrappersdir=$(prefix)/bin
+wrappers_SCRIPTS=atrt-testBackup atrt-mysql-test-run
+
 # Don't update the files from bitkeeper
 %::SCCS/s.%

ndb/test/run-test/atrt-mysql-test-run

+#!/bin/sh
+
+set -e -x
+cd $MYSQL_BASE_DIR/mysql-test 
+./mysql-test-run --with-ndbcluster --ndbconnectstring=$NDB_CONNECTSTRING $*

ndb/test/run-test/atrt-testBackup

+#!/bin/sh
+
+PATH=$PATH:$MYSQL_BASE_DIR/bin
+export PATH
+
+testBackup $*

ndb/test/run-test/daily-devel-tests.txt

+max-time: 2500
+cmd: atrt-mysql-test-run
+args: --do-test=ndb --force
+
 #
 # INDEX
 #
@@ -19,7 +23,7 @@ args: -n CreateLoadDrop T1 T10
 # BACKUP
 #
 max-time: 600
-cmd: testBackup
+cmd: atrt-testBackup
 args: -n BackupOne T1 T6 T3 I3
 
 #max-time: 600

ndb/test/run-test/main.cpp

@@ -451,6 +451,7 @@ setup_config(atrt_config& config){
       proc.m_proc.m_stderr = "2>&1";
       proc.m_proc.m_runas = proc.m_host->m_user;
       proc.m_proc.m_ulimit = "c:unlimited";
+      proc.m_proc.m_env.assfmt("MYSQL_BASE_DIR=%s", dir.c_str());
       proc.m_hostname = proc.m_host->m_hostname;
       proc.m_ndb_mgm_port = g_default_base_port;
       if(split1[0] == "mgm"){
@@ -501,7 +502,7 @@ setup_config(atrt_config& config){
 
   // Setup connect string
   for(size_t i = 0; i<config.m_processes.size(); i++){
-    config.m_processes[i].m_proc.m_env.assfmt("NDB_CONNECTSTRING=%s", 
+    config.m_processes[i].m_proc.m_env.appfmt(" NDB_CONNECTSTRING=%s", 
 					      connect_string.c_str());
   }