bk commit into 5.1 tree (tomas:1.2349)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2349 06/04/21 16:05:42 tomas@stripped +3 -0
  added skip create option to bank test program

  storage/ndb/test/ndbapi/bank/bankCreator.cpp
    1.12 06/04/21 16:05:33 tomas@stripped +3 -0
    added skip create option to bank test program

  storage/ndb/test/ndbapi/bank/BankLoad.cpp
    1.13 06/04/21 16:05:33 tomas@stripped +2 -2
    added skip create option to bank test program

  storage/ndb/test/ndbapi/bank/Bank.hpp
    1.12 06/04/21 16:05:33 tomas@stripped +2 -0
    added skip create option to bank test program

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new

--- 1.11/storage/ndb/test/ndbapi/bank/Bank.hpp	2006-03-04 08:26:21 +01:00
+++ 1.12/storage/ndb/test/ndbapi/bank/Bank.hpp	2006-04-21 16:05:33 +02:00
@@ -29,6 +29,7 @@
 
   Bank(Ndb_cluster_connection&, bool init = true, const char *dbase="BANK");
 
+  int setSkipCreate(bool skip) { m_skip_create = skip; }
   int createAndLoadBank(bool overWrite, bool disk= false, int num_accounts=10);
   int dropBank();
   
@@ -140,6 +141,7 @@
   Ndb m_ndb;
   int m_maxAccount;
   bool m_initialized;
+  bool m_skip_create;
 };
 
 #endif

--- 1.11/storage/ndb/test/ndbapi/bank/bankCreator.cpp	2006-03-04 08:26:21 +01:00
+++ 1.12/storage/ndb/test/ndbapi/bank/bankCreator.cpp	2006-04-21 16:05:33 +02:00
@@ -31,10 +31,12 @@
   int _help = 0;
   char * _database = "BANK";
   int disk = 0;
+  int skip_create = 0;
 
   struct getargs args[] = {
     { "database", 'd', arg_string, &_database, "Database name", ""},
     { "disk", 0, arg_flag, &disk, "Use disk tables", "" },
+    { "skip-create", 0, arg_flag, &skip_create, "Skip create", "" },
     { "usage", '?', arg_flag, &_help, "Print help", "" }
   };
   int num_args = sizeof(args) / sizeof(args[0]);
@@ -55,6 +57,7 @@
 
   Bank bank(con,_database);
   int overWriteExisting = true;
+  bank.setSkipCreate(skip_create);
   if (bank.createAndLoadBank(overWriteExisting, disk) != NDBT_OK)
     return NDBT_ProgramExit(NDBT_FAILED);
   return NDBT_ProgramExit(NDBT_OK);

--- 1.12/storage/ndb/test/ndbapi/bank/BankLoad.cpp	2006-03-04 08:26:21 +01:00
+++ 1.13/storage/ndb/test/ndbapi/bank/BankLoad.cpp	2006-04-21 16:05:33 +02:00
@@ -58,7 +58,7 @@
   m_ndb.init();   
   if (m_ndb.waitUntilReady() != 0)
     return NDBT_FAILED;
-  
+
   const NdbDictionary::Table* pSysValTab = 
     m_ndb.getDictionary()->getTable("SYSTEM_VALUES");
   if (pSysValTab != NULL){
@@ -69,7 +69,7 @@
     }
   }
   
-  if (createTables(disk) != NDBT_OK)
+  if (!m_skip_create && createTables(disk) != NDBT_OK)
     return NDBT_FAILED;
   
   if (clearTables() != NDBT_OK)