Commit 149b45b8 authored by unknown's avatar unknown
Browse files

Merge 


ndb/test/src/NDBT_Test.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/restore/main.cpp:
  Auto merged
ndb/test/ndbapi/testBackup.cpp:
  Auto merged
ndb/tools/select_all.cpp:
  SCCS merged
parents 497f8063 39c2f421

ndb/examples/ndbapi_async_example/ndbapi_async.cpp

+5 −6
Original line number Diff line number Diff line
@@ -46,9 +46,9 @@ 
 *

 *  NdbDictionary::Column

 *       setName()

 *       setPrimaryKey()

 *       setType()

 *       setLength()

 *       setPrimaryKey()

 *       setNullable()

 *

 *  NdbDictionary::Table
@@ -234,9 +234,9 @@ int create_table(Ndb * myNdb) 
 * Column REG_NO

 */

  myColumn.setName("REG_NO");

  myColumn.setPrimaryKey(true);

  myColumn.setType(NdbDictionary::Column::Unsigned);

  myColumn.setLength(1);

  myColumn.setPrimaryKey(true);

  myColumn.setNullable(false);

  myTable.addColumn(myColumn);
@@ -244,9 +244,9 @@ int create_table(Ndb * myNdb) 
 * Column BRAND

 */

  myColumn.setName("BRAND");

  myColumn.setPrimaryKey(false);

  myColumn.setType(NdbDictionary::Column::Char);

  myColumn.setLength(20);

  myColumn.setPrimaryKey(false);

  myColumn.setNullable(false);

  myTable.addColumn(myColumn);
@@ -254,9 +254,9 @@ int create_table(Ndb * myNdb) 
 * Column COLOR

 */

  myColumn.setName("COLOR");

  myColumn.setPrimaryKey(false);

  myColumn.setType(NdbDictionary::Column::Char);

  myColumn.setLength(20);

  myColumn.setPrimaryKey(false);

  myColumn.setNullable(false);

  myTable.addColumn(myColumn);
@@ -454,6 +454,7 @@ int populate(Ndb * myNdb, int data, async_callback_t * cbData) 


int main()

{

  ndb_init();

  Ndb* myNdb = new Ndb( "TEST_DB" );  // Object representing the database

  

  /*******************************************
@@ -493,5 +494,3 @@ int main() 
  std::cout << "Number of temporary errors: " << tempErrors << std::endl;

  delete myNdb; 

}

ndb/examples/ndbapi_example1/ndbapi_example1.cpp

+3 −2
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 


int main()

{

  ndb_init();

  Ndb* myNdb = new Ndb( "TEST_DB_1" );  // Object representing the database

  NdbDictionary::Table myTable;

  NdbDictionary::Column myColumn;
@@ -78,16 +79,16 @@ int main() 
  myTable.setName("MYTABLENAME");

  

  myColumn.setName("ATTR1");

  myColumn.setPrimaryKey(true);

  myColumn.setType(NdbDictionary::Column::Unsigned);

  myColumn.setLength(1);

  myColumn.setPrimaryKey(true);

  myColumn.setNullable(false);

  myTable.addColumn(myColumn);



  myColumn.setName("ATTR2");

  myColumn.setPrimaryKey(false);

  myColumn.setType(NdbDictionary::Column::Unsigned);

  myColumn.setLength(1);

  myColumn.setPrimaryKey(false);

  myColumn.setNullable(false);

  myTable.addColumn(myColumn);

ndb/examples/ndbapi_example2/ndbapi_example2.cpp

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ static void callback(int result, NdbConnection* NdbObject, void* aObject); 


int main()

{

  ndb_init();

  Ndb* myNdb = new Ndb( "TEST_DB_2" );  // Object representing the database



  NdbConnection*  myNdbConnection[2];   // For transactions

ndb/examples/ndbapi_example3/ndbapi_example3.cpp

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ int executeInsertTransaction(int transactionId, Ndb* myNdb) { 


int main()

{

  ndb_init();

  Ndb* myNdb = new Ndb( "TEST_DB_1" );  // Object representing the database

  

  /*******************************************

ndb/examples/ndbapi_example4/ndbapi_example4.cpp

+3 −2
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 


int main()

{

  ndb_init();

  Ndb* myNdb = new Ndb( "TEST_DB_1" );  // Object representing the database

  NdbDictionary::Table myTable;

  NdbDictionary::Column myColumn;
@@ -79,16 +80,16 @@ int main() 
  myTable.setName("MYTABLENAME");

  

  myColumn.setName("ATTR1");

  myColumn.setPrimaryKey(true);

  myColumn.setType(NdbDictionary::Column::Unsigned);

  myColumn.setLength(1);

  myColumn.setPrimaryKey(true);

  myColumn.setNullable(false);

  myTable.addColumn(myColumn);



  myColumn.setName("ATTR2");

  myColumn.setPrimaryKey(false);

  myColumn.setType(NdbDictionary::Column::Unsigned);

  myColumn.setLength(1);

  myColumn.setPrimaryKey(false);

  myColumn.setNullable(false);

  myTable.addColumn(myColumn);