Merge mysql.com:/home/jonas/src/mysql-4.1

into mysql.com:/home/jonas/src/mysql-5.0


ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
ndb/test/run-test/daily-devel-tests.txt:
  Auto merged

ndb/test/run-test/daily-basic-tests.txt

-max-time: 25000
+max-time: 3600
 cmd: atrt-mysql-test-run
 args: --force
 

ndb/test/run-test/daily-devel-tests.txt

@@ -204,3 +204,32 @@ max-time: 2500
 cmd: test_event
 args: -n BasicEventOperation T1 T6 
 
+max-time: 300
+cmd: DbCreate
+args:
+
+max-time: 180
+cmd: DbAsyncGenerator
+args: -t 60 -p 1
+type: bench
+
+max-time: 180
+cmd: DbAsyncGenerator
+args: -t 60 -p 25
+type: bench
+
+max-time: 180
+cmd: DbAsyncGenerator
+args: -t 60 -p 100
+type: bench
+
+max-time: 180
+cmd: DbAsyncGenerator
+args: -t 60 -p 200
+type: bench
+
+max-time: 180
+cmd: DbAsyncGenerator
+args: -t 60 -p 1 -proc 25
+type: bench
+

ndb/test/run-test/main.cpp

@@ -219,7 +219,7 @@ main(int argc, const char ** argv){
       fflush(g_report_file);
     }    
 
-    if(g_mode_bench || (g_mode_regression && result)){
+    if(test_case.m_report || g_mode_bench || (g_mode_regression && result)){
       BaseString tmp;
       tmp.assfmt("result.%d", test_no);
       if(rename("result", tmp.c_str()) != 0){
@@ -228,7 +228,7 @@ main(int argc, const char ** argv){
 	goto end;
       }
     }
-
+    
     if(g_mode_interactive && result){
       g_logger.info
 	("Encountered failed test in interactive mode - terminating");
@@ -908,6 +908,11 @@ read_test_case(FILE * file, atrt_testcase& tc, int& line){
     tc.m_max_time = 60000;
   else
     tc.m_max_time = atoi(mt);
+
+  if(p.get("type", &mt) && strcmp(mt, "bench") == 0)
+    tc.m_report= true;
+  else
+    tc.m_report= false;
   
   return true;
 }

ndb/test/run-test/run-test.hpp

@@ -68,6 +68,7 @@ struct atrt_config {
 };
 
 struct atrt_testcase {
+  bool m_report;
   time_t m_max_time;
   BaseString m_command;
   BaseString m_args;