bk commit into 5.0 tree (gni:1.2586) BUG#30737

[gni]

Below is the list of changes that have just been committed into a local
5.0 repository of gni. When gni 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-07 15:40:50+08:00, gni@stripped +1 -0
  BUG#30737 ndbapi_scan doesn't work 

  ndb/ndbapi-examples/ndbapi_scan_example/ndbapi_scan.cpp@stripped, 2008-03-07 15:40:45+08:00, gni@stripped +3 -3
    1. the length parameter should be supplied for cmp method of NdbScanFilter, 
       or the default length is 0
    2. when reusing the same transaction agian after execute(Commit), 
       it should be restarted firstly no matter how execute(Commit) succeeds or fails

diff -Nrup a/ndb/ndbapi-examples/ndbapi_scan_example/ndbapi_scan.cpp b/ndb/ndbapi-examples/ndbapi_scan_example/ndbapi_scan.cpp
--- a/ndb/ndbapi-examples/ndbapi_scan_example/ndbapi_scan.cpp	2006-12-24 03:04:12 +08:00
+++ b/ndb/ndbapi-examples/ndbapi_scan_example/ndbapi_scan.cpp	2008-03-07 15:40:45 +08:00
@@ -284,7 +284,7 @@ int scan_delete(Ndb* myNdb, 
      */ 
     NdbScanFilter filter(myScanOp) ;   
     if(filter.begin(NdbScanFilter::AND) < 0  || 
-       filter.cmp(NdbScanFilter::COND_EQ, column, color) < 0 ||
+       filter.cmp(NdbScanFilter::COND_EQ, column, color, 20) < 0 ||
        filter.end() < 0)
     {
       std::cout <<  myTrans->getNdbError().message << std::endl;
@@ -340,7 +340,7 @@ int scan_delete(Ndb* myNdb, 
 	check = myTrans->execute(NdbTransaction::Commit);   
       }
 
-      if(check == -1)
+//      if(check == -1)
       {
 	/**
 	 * Create a new transaction, while keeping scan open
@@ -463,7 +463,7 @@ int scan_update(Ndb* myNdb, 
      */ 
     NdbScanFilter filter(myScanOp) ;   
     if(filter.begin(NdbScanFilter::AND) < 0  || 
-       filter.cmp(NdbScanFilter::COND_EQ, update_column, before_color) <0||
+       filter.cmp(NdbScanFilter::COND_EQ, update_column, before_color, 20) <0||
        filter.end() <0)
     {
       std::cout <<  myTrans->getNdbError().message << std::endl;