bk commit into 5.1 tree (jonas:1.2571)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas.  When jonas does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-03-14 08:23:11+01:00, jonas@stripped +1 -0
  fix (newly introduced breakage) of testScanPerf

  storage/ndb/test/ndbapi/testScanPerf.cpp@stripped, 2008-03-14 08:23:10+01:00, jonas@stripped +5 -4
    fix (newly introduced breakage) of testScanPerf

diff -Nrup a/storage/ndb/test/ndbapi/testScanPerf.cpp b/storage/ndb/test/ndbapi/testScanPerf.cpp
--- a/storage/ndb/test/ndbapi/testScanPerf.cpp	2008-02-19 16:00:28 +01:00
+++ b/storage/ndb/test/ndbapi/testScanPerf.cpp	2008-03-14 08:23:10 +01:00
@@ -59,7 +59,7 @@ g_paramters[] = {
   { "fetch",       0, 0, 1 }, // nextResult fetchAllowed.  No, yes
   { "size",  1000000, 1, ~0 }, // Num rows to operate on
   { "iterations",  3, 1, ~0 }, // Num times to repeat tests
-  { "create_drop", 1, 0, 1 }, // Whether to recreate the table
+  { "create_drop", 1, 0, 2 }, // Whether to recreate the table
   { "data",        1, 0, 1 }, // Ignored currently
   { "multi read range", 1000, 1, ~0 } // Number of ranges to use in MRR access (range=3)
 };
@@ -126,7 +126,7 @@ main(int argc, const char** argv){
     BaseString::snprintf(g_indexname, sizeof(g_indexname), "IDX_%s", T);
     if(create_table())
       goto error;
-    if(run_scan())
+    if(g_paramters[P_CREATE].value != 2 && run_scan())
       goto error;
   }
 
@@ -300,7 +300,7 @@ run_scan(){
     }
     
     int par = g_paramters[P_PARRA].value;
-    int bat = 0; // g_paramters[P_BATCH].value;
+    int bat = g_paramters[P_BATCH].value;
     NdbScanOperation::LockMode lm;
     switch(g_paramters[P_LOCK].value){
     case 0:
@@ -317,6 +317,7 @@ run_scan(){
     }
 
     NdbScanOperation::ScanOptions options;
+    bzero(&options, sizeof(options));
 
     options.optionsPresent= 
       NdbScanOperation::ScanOptions::SO_SCANFLAGS |
@@ -367,7 +368,7 @@ run_scan(){
       assert(pOp);
     } else {
       pOp= pIOp= pTrans->scanIndex(g_index_record,
-                                   g_index_record,
+                                   g_table_record,
                                    lm,
                                    NULL, // Mask
                                    NULL, // First IndexBound