Merge

1 files changed, 9 insertions, 8 deletions

diff --git a/ndb/test/ndbapi/index.cpp b/ndb/test/ndbapi/index.cpp
index 508186de529..c22da594164 100644
--- a/ndb/test/ndbapi/index.cpp
+++ b/ndb/test/ndbapi/index.cpp
@@ -81,63 +81,63 @@ static void createTable(Ndb &myNdb, bool storeInACC, bool twoKey, bool longKey)
   int res;
 
   column.setName("NAME");
-  column.setPrimaryKey(true);
   column.setType(NdbDictionary::Column::Char);
   column.setLength((longKey)?
 		   1024       // 1KB => long key
 		   :12);
+  column.setPrimaryKey(true);
   column.setNullable(false);
   table.addColumn(column);
 
   if (twoKey) {
     column.setName("KEY2");
-    column.setPrimaryKey(true);
     column.setType(NdbDictionary::Column::Unsigned);
     column.setLength(1);
+    column.setPrimaryKey(true);
     column.setNullable(false);
     table.addColumn(column);
   }
 
   column.setName("PNUM1");
-  column.setPrimaryKey(false);
   column.setType(NdbDictionary::Column::Unsigned);
   column.setLength(1);
+  column.setPrimaryKey(false);
   column.setNullable(false);
   table.addColumn(column);
 
   column.setName("PNUM2");
-  column.setPrimaryKey(false);
   column.setType(NdbDictionary::Column::Unsigned);
   column.setLength(1);
+  column.setPrimaryKey(false);
   column.setNullable(false);
   table.addColumn(column);
 
   column.setName("PNUM3");
-  column.setPrimaryKey(false);
   column.setType(NdbDictionary::Column::Unsigned);
   column.setLength(1);
+  column.setPrimaryKey(false);
   column.setNullable(false);
   table.addColumn(column);
 
   column.setName("PNUM4");
-  column.setPrimaryKey(false);
   column.setType(NdbDictionary::Column::Unsigned);
   column.setLength(1);
+  column.setPrimaryKey(false);
   column.setNullable(false);
   table.addColumn(column);
 
   column.setName("AGE");
-  column.setPrimaryKey(false);
   column.setType(NdbDictionary::Column::Unsigned);
   column.setLength(1);
+  column.setPrimaryKey(false);
   column.setNullable(false);
   table.addColumn(column);
 
   column.setName("STRING_AGE");
-  column.setPrimaryKey(false);
   column.setType(NdbDictionary::Column::Char);
   column.setLength(1);
   column.setLength(256);
+  column.setPrimaryKey(false);
   column.setNullable(false);
   table.addColumn(column);
 
@@ -771,6 +771,7 @@ static void dropIndex(Ndb &myNdb, unsigned int noOfIndexes)
 
 NDB_COMMAND(indexTest, "indexTest", "indexTest", "indexTest", 65535)
 {
+  ndb_init();
   bool createTableOp, createIndexOp, dropIndexOp, insertOp, updateOp, deleteOp, readOp, readIndexOp, updateIndexOp, deleteIndexOp, twoKey, longKey;
   unsigned int noOfTuples = 1;
   unsigned int noOfOperations = 1;