bzr commit into mysql-5.1 branch (jonas:2659)

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.2/

 2659 Jonas Oreland	2008-08-23
      ndb - autotest fixes
modified:
  storage/ndb/test/ndbapi/testSystemRestart.cpp
  storage/ndb/test/run-test/files.cpp

=== modified file 'storage/ndb/test/ndbapi/testSystemRestart.cpp'
--- a/storage/ndb/test/ndbapi/testSystemRestart.cpp	2008-06-18 14:50:56 +0000
+++ b/storage/ndb/test/ndbapi/testSystemRestart.cpp	2008-08-22 22:07:53 +0000
@@ -1560,6 +1560,7 @@ int runBug22696(NDBT_Context* ctx, NDBT_
   Uint32 i = 0;
   while(i<=loops && result != NDBT_FAILED)
   {
+    ndbout_c("loop %u", i);
     for (Uint32 j = 0; j<10 && result != NDBT_FAILED; j++)
       CHECK(hugoTrans.scanUpdateRecords(pNdb, rows) == 0);
     

=== modified file 'storage/ndb/test/run-test/files.cpp'
--- a/storage/ndb/test/run-test/files.cpp	2008-08-22 13:52:37 +0000
+++ b/storage/ndb/test/run-test/files.cpp	2008-08-22 22:07:53 +0000
@@ -296,20 +296,21 @@ setup_files(atrt_config& config, int set
           g_logger.error("Failed to open %s for writing", tmp.c_str());
           return false;
         }
-        fprintf(fenv, "#!/bin/sh                             \n");
-        fprintf(fenv, ". ./env.sh                            \n");
-        fprintf(fenv, "BIN=`echo $CMD | awk '{ print $1;}'`  \n");
-        fprintf(fenv, "cores=`find . -name 'core*'`          \n");
-        fprintf(fenv, "if [ \"$cores\" ]                     \n");
-        fprintf(fenv, "then                                  \n");
-        fprintf(fenv, "echo \"thread apply all bt\" > bt.gdb \n");
-        fprintf(fenv, "echo \"quit\" >> bt.gdb               \n");
-        fprintf(fenv, "echo for i in $cores                  \n");
-        fprintf(fenv, "do                                    \n");
-        fprintf(fenv, "echo \"*** $i\" >> bt.txt             \n");
-        fprintf(fenv, "echo gdb -q -batch -x bt.gdb -c $i $BIN >> bt.txt 2> /dev/null \n");
-        fprintf(fenv, "done                                  \n");
-        fprintf(fenv, "fi                                    \n");
+        fprintf(fenv, "#!/bin/sh                               \n");
+        fprintf(fenv, ". ./env.sh                              \n");
+        fprintf(fenv, "BIN=`echo $CMD | awk '{ print $1;}'`    \n");
+        fprintf(fenv, "cores=`find . -name 'core*'`            \n");
+        fprintf(fenv, "if [ \"$cores\" ]                       \n");
+        fprintf(fenv, "then                                    \n");
+        fprintf(fenv, "  echo \"thread apply all bt\" > bt.gdb \n");
+        fprintf(fenv, "  echo \"quit\" >> bt.gdb               \n");
+        fprintf(fenc, "  rm -f bt.txt                          \n"
+        fprintf(fenv, "  for i in \"$cores\"                   \n");
+        fprintf(fenv, "  do                                    \n");
+        fprintf(fenv, "    echo \"*** $i\" >> bt.txt           \n");
+        fprintf(fenv, "    gdb -q -batch -x bt.gdb -c $i $BIN >> bt.txt 2> /dev/null \n");
+        fprintf(fenv, "  done                                  \n");
+        fprintf(fenv, "fi                                      \n");
         fflush(fenv);
         fclose(fenv);
       }