List:Commits« Previous MessageNext Message »
From:Martin Zaun Date:January 11 2011 4:10pm
Subject:bzr commit into mysql-5.1-telco-7.1 branch (martin.zaun:4015)
View as plain text  
#At file:///Users/mz/mysql/ndb-7.1-opt64/ based on revid:pekka@stripped

 4015 Martin Zaun	2011-01-11
      crund - minor changes

    modified:
      storage/ndb/test/crund/src/com/mysql/cluster/crund/JdbcLoad.java
      storage/ndb/test/crund/src/crundndb/CrundNdbApiOperations.cpp
=== modified file 'storage/ndb/test/crund/src/com/mysql/cluster/crund/JdbcLoad.java'
--- a/storage/ndb/test/crund/src/com/mysql/cluster/crund/JdbcLoad.java	2010-10-19 22:56:45 +0000
+++ b/storage/ndb/test/crund/src/com/mysql/cluster/crund/JdbcLoad.java	2011-01-11 16:10:36 +0000
@@ -478,6 +478,7 @@ public class JdbcLoad extends CrundDrive
                     });
             }
 
+            if (false) { // works but not implemented in other backends yet
             for (int i = 3, l = 1000; l <= maxBlobBytes; l *= 10, i++) {
                 final byte[] b = bytes[i];
                 assert l == b.length;
@@ -525,7 +526,9 @@ public class JdbcLoad extends CrundDrive
                         }
                     });
             }
-
+            }
+            
+            if (false) { // works but not implemented in other backends yet
             for (int i = 3, l = 1000; l <= maxTextChars; l *= 10, i++) {
                 final String s = strings[i];
                 assert l == s.length();
@@ -573,7 +576,8 @@ public class JdbcLoad extends CrundDrive
                         }
                     });
             }
-
+            }
+            
             ops.add(
                 new JdbcOp("setB0->A" + (batch ? "_batch" : ""),
                            "UPDATE b0 b0 SET b0.a_id = ? WHERE (b0.id = ?)") {

=== modified file 'storage/ndb/test/crund/src/crundndb/CrundNdbApiOperations.cpp'
--- a/storage/ndb/test/crund/src/crundndb/CrundNdbApiOperations.cpp	2010-10-08 11:17:35 +0000
+++ b/storage/ndb/test/crund/src/crundndb/CrundNdbApiOperations.cpp	2011-01-11 16:10:36 +0000
@@ -941,7 +941,7 @@ CrundNdbApiOperations::navB0ToA(int coun
             if (op->getValue(model->attr_B0_a_id, (char*)&a_id) == NULL)
                 ABORT_NDB_ERROR(tx->getNdbError());
         }
-        executeOperations(); // start the scan; don't commit yet
+        executeOperations(); // execute the operation; don't commit yet
 
         // fetch the attributes from A
         {
@@ -1023,7 +1023,7 @@ CrundNdbApiOperations::navB0ToAalt(int c
         if (!batch)
             executeOperations();
     }
-    executeOperations(); // start the scan; don't commit yet
+    executeOperations(); // execute the operation; don't commit yet
 
     // allocate attributes holder
     CommonAB* const ab = new CommonAB[count_B];


Attachment: [text/bzr-bundle] bzr/martin.zaun@oracle.com-20110111161036-ad24m3ud38f9eu32.bundle
Thread
bzr commit into mysql-5.1-telco-7.1 branch (martin.zaun:4015) Martin Zaun11 Jan