Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb

into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge

ndb/src/ndbapi/NdbScanOperation.cpp

@@ -674,7 +674,6 @@ void NdbScanOperation::closeScan()
     
     if(m_api_receivers_count+m_conf_receivers_count){
       // Send close scan
-      ndbout_c("sending close %d %d", m_api_receivers_count, m_conf_receivers_count);
       send_next_scan(0, true); // Close scan
     }
     

ndb/test/src/UtilTransactions.cpp

@@ -1138,19 +1138,32 @@ UtilTransactions::readRowFromTableAndIndex(Ndb* pNdb,
      */    
     NdbIndexOperation* pIndexOp= NULL;
     NdbIndexScanOperation *pScanOp= NULL;
+    NdbOperation *pIOp= 0;
+
+    bool null_found= false;
+    for(a = 0; a<(int)pIndex->getNoOfColumns(); a++){
+      const NdbDictionary::Column *  col = pIndex->getColumn(a);
+      
+      if (row.attributeStore(col->getName())->isNULL())
+      {
+	null_found= true;
+	break;
+      }
+    }
+    
+    const char * tabName= tab.getName();
+    if(!null_found)
     {
-      void* pOpCheck= NULL;
       if (indexType == NdbDictionary::Index::UniqueHashIndex) {
-	pOpCheck= pIndexOp= pTrans1->getNdbIndexOperation(indexName, tab.getName());
+	pIOp= pIndexOp= pTrans1->getNdbIndexOperation(indexName, tabName);
       } else {
-	pOpCheck= pScanOp= pTrans1->getNdbIndexScanOperation(indexName, tab.getName());
+	pIOp= pScanOp= pTrans1->getNdbIndexScanOperation(indexName, tabName);
       }
       
-      if (pOpCheck == NULL) {
+      if (pIOp == NULL) {
 	ERR(pTrans1->getNdbError());
 	goto close_all;
       }
-    }
     
       {
 	bool not_ok;
@@ -1174,20 +1187,13 @@ UtilTransactions::readRowFromTableAndIndex(Ndb* pNdb,
 	const NdbDictionary::Column *  col = pIndex->getColumn(a);
 	
 	int r;
-      if (pIndexOp)
-	r = pIndexOp->equal(col->getName(), row.attributeStore(col->getName())->aRef());
-      else {
-	// setBound not possible for null attributes
 	if ( !row.attributeStore(col->getName())->isNULL() ) {
-	  r = pScanOp->setBound(col->getName(),
-				NdbIndexScanOperation::BoundEQ,
-				row.attributeStore(col->getName())->aRef());
-	}
-      }
-      if (r != 0){
+	  if(pIOp->equal(col->getName(), 
+			 row.attributeStore(col->getName())->aRef()) != 0){
 	    ERR(pTrans1->getNdbError());
 	    goto close_all;
 	  }
+	}
 #if VERBOSE
 	printf("%s = %d: ", col->getName(), row.attributeStore(a)->aRef());
 #endif
@@ -1203,12 +1209,8 @@ UtilTransactions::readRowFromTableAndIndex(Ndb* pNdb,
       for(a = 0; a<tab.getNoOfColumns(); a++){
 	void* pCheck;
 	
-      if (pIndexOp)
-	pCheck= indexRow.attributeStore(a)=
-	  pIndexOp->getValue(tab.getColumn(a)->getName());
-      else
 	pCheck= indexRow.attributeStore(a)= 
-	  pScanOp->getValue(tab.getColumn(a)->getName());
+	  pIOp->getValue(tab.getColumn(a)->getName());
 	
 	if(pCheck == NULL) {
 	  ERR(pTrans1->getNdbError());
@@ -1218,6 +1220,7 @@ UtilTransactions::readRowFromTableAndIndex(Ndb* pNdb,
 	printf("%s ", tab.getColumn(a)->getName());
 #endif
       }
+    }
 #if VERBOSE
     printf("\n");
 #endif
@@ -1242,6 +1245,7 @@ UtilTransactions::readRowFromTableAndIndex(Ndb* pNdb,
     /** 
      * Compare the two rows
      */ 
+    if(!null_found){
       if (pScanOp) {
 	if (cursor->nextResult() != 0){
 	  const NdbError err = pTrans1->getNdbError();
@@ -1264,11 +1268,12 @@ UtilTransactions::readRowFromTableAndIndex(Ndb* pNdb,
 	  goto close_all;
 	}
       }
+    }
     return_code= NDBT_OK;
     goto close_all;
   }
   
- close_all:
+close_all:
   if (cursor)
     cursor->close();
   if (pTrans1)