Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb

into mysql.com:/home/jonas/src/mysql-5.0-ndb

ndb/include/ndbapi/Ndb.hpp

@@ -583,7 +583,8 @@
    
    As noted previously, the application programmer can provide hints to the NDB API as to 
    which transaction co-ordinator it should use. This is done by
-   providing a <em>partition key</em> (usually the primary key).
+   providing a <em>table</em> and <em>partition key</em> 
+   (usually the primary key).
    By using the primary key as the partition key, 
    the transaction will be placed on the node where the primary replica
    of that record resides.

ndb/test/ndbapi/testNdbApi.cpp

@@ -119,6 +119,9 @@ int runTestMaxTransaction(NDBT_Context* ctx, NDBT_Step* step){
     return NDBT_FAILED;
   }
 
+  const NdbDictionary::Table* pTab = ctx->getTab();
+  if (pTab == 0) abort();
+
   while (l < loops && result == NDBT_OK){
     int errors = 0;
     int maxErrors = 5;
@@ -137,7 +140,7 @@ int runTestMaxTransaction(NDBT_Context* ctx, NDBT_Step* step){
 	pCon = pNdb->startTransaction();
 	break;
       case 1:
-	pCon = pNdb->startTransaction(2,
+	pCon = pNdb->startTransaction(pTab,
 				      "DATA",
 				      4);
 	break;