Commit d52d6800 authored by unknown's avatar unknown

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
...@@ -8,7 +8,7 @@ rm -rf * ...@@ -8,7 +8,7 @@ rm -rf *
while [ $# -gt 0 ] while [ $# -gt 0 ]
do do
rsync -a --exclude='ndb_*_fs/*' "$1" . rsync -a --exclude='BACKUP' --exclude='ndb_*_fs' "$1" .
shift shift
done done
......
...@@ -246,8 +246,9 @@ cd $res_dir ...@@ -246,8 +246,9 @@ cd $res_dir
echo "date=$DATE" > info.txt echo "date=$DATE" > info.txt
echo "suite=$RUN" >> info.txt echo "suite=$RUN" >> info.txt
echo "clone=$clone" >> info.txt echo "clone=mysql-$clone" >> info.txt
echo "arch=$target" >> info.txt echo "arch=$target" >> info.txt
find . | xargs chmod ugo+r
cd .. cd ..
p2=`pwd` p2=`pwd`
......
...@@ -238,6 +238,12 @@ main(int argc, char ** argv) ...@@ -238,6 +238,12 @@ main(int argc, char ** argv)
g_logger.info("(Re)starting server processes processes"); g_logger.info("(Re)starting server processes processes");
if(!stop_processes(g_config, ~0)) if(!stop_processes(g_config, ~0))
goto end; goto end;
if (!setup_directories(g_config, 2))
goto end;
if (!setup_files(g_config, 2, 1))
goto end;
if(!setup_hosts(g_config)) if(!setup_hosts(g_config))
goto end; goto end;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment