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

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

ndb/test/ndbapi/testBitfield.cpp

@@ -54,6 +54,9 @@ main(int argc, char** argv){
   load_defaults("my",load_default_groups,&argc,&argv);
   int ho_error;
 
+  argc--;
+  argv++;
+  
   Ndb_cluster_connection con(opt_connect_str);
   if(con.connect(12, 5, 1))
   {

ndb/test/ndbapi/testNdbApi.cpp

@@ -131,7 +131,7 @@ int runTestMaxTransaction(NDBT_Context* ctx, NDBT_Step* step){
 
       NdbConnection* pCon;
       
-      int type = i%4;
+      int type = i%2;
       switch (type){
       case 0:
 	pCon = pNdb->startTransaction();
@@ -141,25 +141,6 @@ int runTestMaxTransaction(NDBT_Context* ctx, NDBT_Step* step){
 				      "DATA",
 				      4);
 	break;
-      case 2:
-	ndbout_c("startTransactionDGroup not supported");
-	abort();
-	/*	  
-	pCon = pNdb->startTransactionDGroup(1, 
-					    "TEST",
-					    0);
-	*/
-	break;
-      case 3:      
-	ndbout_c("startTransactionDGroup not supported");
-	abort();
-	/*	  
-	pCon = pNdb->startTransactionDGroup(2, 
-					    "TEST",
-					    1);
-	*/
-	break;
-
       default:
 	abort();
       }

ndb/test/run-test/daily-basic-tests.txt

@@ -458,71 +458,7 @@ args:
 
 max-time: 1500
 cmd: testTransactions
-args: T1
-
-max-time: 1500
-cmd: testTransactions
-args: T2
-
-max-time: 1500
-cmd: testTransactions
-args: T3
-
-max-time: 1500
-cmd: testTransactions
-args: T4
-
-max-time: 1500
-cmd: testTransactions
-args: T5
-
-max-time: 1500
-cmd: testTransactions
-args: T6
-
-max-time: 1500
-cmd: testTransactions
-args: T7
-
-max-time: 1500
-cmd: testTransactions
-args: T8
-
-max-time: 1500
-cmd: testTransactions
-args: T9
-
-max-time: 1500
-cmd: testTransactions
-args: T10
-
-max-time: 1500
-cmd: testTransactions
-args: T11
-
-max-time: 1500
-cmd: testTransactions
-args: T12
-
-max-time: 1500
-cmd: testTransactions
-args: T13
-
-max-time: 1500
-cmd: testTransactions
-args: T14
-
-max-time: 1500
-cmd: testTransactions
-args: I1
-
-max-time: 1500
-cmd: testTransactions
-args: I2
-
-max-time: 1500
-cmd: testTransactions
-args: I3
+args:
 
 max-time: 1500
 cmd: testRestartGci