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

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


ndb/test/ndbapi/testScanPerf.cpp:
  Auto merged

ndb/test/ndbapi/testScanPerf.cpp

@@ -222,6 +222,7 @@ run_scan(){
   int sum_time= 0;
 
   int sample_rows = 0;
+  int tot_rows = 0;
   NDB_TICKS sample_start = NdbTick_CurrentMillisecond();
 
   Uint32 tot = g_paramters[P_ROWS].value;
@@ -296,7 +297,7 @@ run_scan(){
 	break;
       }
       }
-      if(g_paramters[P_RESET].value == 1)
+      if(g_paramters[P_RESET].value == 2)
 	goto execute;
     }
     assert(pOp);
@@ -330,6 +331,9 @@ run_scan(){
     }
     assert(check == 0);
 
+    if(g_paramters[P_RESET].value == 1)
+      g_paramters[P_RESET].value = 2;
+    
     for(int i = 0; i<g_table->getNoOfColumns(); i++){
       pOp->getValue(i);
     }
@@ -364,6 +368,7 @@ execute:
     int time_passed= (int)(stop - start1);
     sample_rows += rows;
     sum_time+= time_passed;
+    tot_rows+= rows;
     
     if(sample_rows >= tot)
     {
@@ -376,7 +381,7 @@ execute:
     }
   }
   
-  g_err.println("Avg time: %d ms = %u rows/sec", sum_time/iter,
-                (1000*tot*iter)/sum_time);
+  g_err.println("Avg time: %d ms = %u rows/sec", sum_time/tot_rows,
+                (1000*tot_rows)/sum_time);
   return 0;
 }