Merge perch.ndb.mysql.com:/home/jonas/src/51-work

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/test/run-test/main.cpp:
  Auto merged

3 files changed, 9 insertions, 2 deletions

diff --git a/storage/ndb/test/run-test/atrt-gather-result.sh b/storage/ndb/test/run-test/atrt-gather-result.sh
index ca5f0a76736..f2473578b41 100755
--- a/storage/ndb/test/run-test/atrt-gather-result.sh
+++ b/storage/ndb/test/run-test/atrt-gather-result.sh
@@ -8,7 +8,7 @@ rm -rf *
 
 while [ $# -gt 0 ]
 do
-  rsync -a --exclude='ndb_*_fs/*' "$1" .
+  rsync -a --exclude='BACKUP' --exclude='ndb_*_fs' "$1" .
   shift
 done
 
diff --git a/storage/ndb/test/run-test/autotest-run.sh b/storage/ndb/test/run-test/autotest-run.sh
index 6136a3a1060..34c3fe53949 100644
--- a/storage/ndb/test/run-test/autotest-run.sh
+++ b/storage/ndb/test/run-test/autotest-run.sh
@@ -246,8 +246,9 @@ cd $res_dir
 
 echo "date=$DATE" > info.txt
 echo "suite=$RUN" >> info.txt
-echo "clone=$clone" >> info.txt
+echo "clone=mysql-$clone" >> info.txt
 echo "arch=$target" >> info.txt
+find . | xargs chmod ugo+r
 
 cd ..
 p2=`pwd`
diff --git a/storage/ndb/test/run-test/main.cpp b/storage/ndb/test/run-test/main.cpp
index 0e3eaadb6fb..2e8d6bfde6d 100644
--- a/storage/ndb/test/run-test/main.cpp
+++ b/storage/ndb/test/run-test/main.cpp
@@ -238,6 +238,12 @@ main(int argc, char ** argv)
       g_logger.info("(Re)starting server processes processes");
       if(!stop_processes(g_config, ~0))
 	goto end;
+
+      if (!setup_directories(g_config, 2))
+	goto end;
+      
+      if (!setup_files(g_config, 2, 1))
+	goto end;
       
       if(!setup_hosts(g_config))
         goto end;