Commit d52d6800 authored by unknown's avatar unknown
Browse files

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
parents 2ff4bc7e 9ededefd

storage/ndb/test/run-test/atrt-gather-result.sh

+1 −1
Original line number Diff line number Diff line
@@ -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

storage/ndb/test/run-test/autotest-run.sh

+2 −1
Original line number Diff line number Diff line
@@ -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`

storage/ndb/test/run-test/main.cpp

+6 −0
Original line number Diff line number Diff line
@@ -239,6 +239,12 @@ main(int argc, char ** argv) 
      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;