Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


client/mysqltest.c:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

1 files changed, 30 insertions, 0 deletions

diff --git a/client/mysqltest.c b/client/mysqltest.c
index 50d814e3f9b..e20e4689504 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -5088,6 +5088,35 @@ static void init_var_hash(MYSQL *mysql)
   DBUG_VOID_RETURN;
 }
 
+static void mark_progress(int line)
+{
+#ifdef NOT_YET
+  static FILE* fp = NULL;
+  static double first;
+
+  struct timeval tv;
+  double now;
+
+  if (!fp)
+  {
+
+    fp = fopen("/tmp/mysqltest_progress.log", "wt");
+
+    if (!fp)
+    {
+      abort();
+    }
+
+    gettimeofday(&tv, NULL);
+    first = tv.tv_sec * 1e6 + tv.tv_usec;
+  }
+
+  gettimeofday(&tv, NULL);
+  now = tv.tv_sec * 1e6 + tv.tv_usec;
+
+  fprintf(fp, "%d %f\n", parser.current_line, (now - first) / 1e6);
+#endif
+}
 
 int main(int argc, char **argv)
 {
@@ -5447,6 +5476,7 @@ int main(int argc, char **argv)
     }
 
     parser.current_line += current_line_inc;
+    mark_progress(parser.current_line);
   }
 
   start_lineno= 0;