bk commit into 5.1 tree (jmiller:1.2562)

[jmiller]

Below is the list of changes that have just been committed into a local
5.1 repository of jmiller.  When jmiller 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@stripped, 2008-04-07 21:50:11+02:00, jmiller@stripped +2 -0
  testDict.cpp, testBlobs.cpp:
    Updated to remove compile warnings

  storage/ndb/test/ndbapi/testBlobs.cpp@stripped, 2008-04-07 21:49:48+02:00, jmiller@stripped +3 -3
    Updated to remove compile warnings

  storage/ndb/test/ndbapi/testDict.cpp@stripped, 2008-04-07 21:49:59+02:00, jmiller@stripped +7 -9
    Updated to remove compile warnings

diff -Nrup a/storage/ndb/test/ndbapi/testBlobs.cpp b/storage/ndb/test/ndbapi/testBlobs.cpp
--- a/storage/ndb/test/ndbapi/testBlobs.cpp	2007-04-27 11:46:37 +02:00
+++ b/storage/ndb/test/ndbapi/testBlobs.cpp	2008-04-07 21:49:48 +02:00
@@ -497,7 +497,7 @@ setBlobValue(const Tup& tup, int error_c
 static int
 getBlobValue(NdbBlob* h, const Bval& v)
 {
-  bool null = (v.m_val == 0);
+  //bool null = (v.m_val == 0);
   DBG("getValue " <<  h->getColumn()->getName() << " buflen=" << v.m_buflen);
   CHK(h->getValue(v.m_buf, v.m_buflen) == 0);
   return 0;
@@ -730,8 +730,8 @@ verifyHeadInline(const Tup& tup)
   CHK(g_opr->equal("PK1", tup.m_pk1) == 0);
   if (g_opt.m_pk2len != 0)
     CHK(g_opr->equal("PK2", tup.m_pk2) == 0);
-  NdbRecAttr* ra1;
-  NdbRecAttr* ra2;
+  NdbRecAttr* ra1 = 0;
+  NdbRecAttr* ra2 = 0;
   CHK((ra1 = g_opr->getValue("BL1")) != 0);
   if (! g_opt.m_oneblob)
     CHK((ra2 = g_opr->getValue("BL2")) != 0);
diff -Nrup a/storage/ndb/test/ndbapi/testDict.cpp b/storage/ndb/test/ndbapi/testDict.cpp
--- a/storage/ndb/test/ndbapi/testDict.cpp	2008-01-10 12:47:50 +01:00
+++ b/storage/ndb/test/ndbapi/testDict.cpp	2008-04-07 21:49:59 +02:00
@@ -323,7 +323,7 @@ int runCreateAndDropAtRandom(NDBT_Contex
     i++;
   }
   
-  for (Uint32 i = 0; i<numTables; i++)
+  for (int i = 0; i<numTables; i++)
     if (tabList[i])
       pDic->dropTable(NDBT_Tables::getTable(i)->getName());
   
@@ -1528,7 +1528,7 @@ runTestDictionaryPerf(NDBT_Context* ctx,
 
   Ndb* pNdb = GETNDB(step);  
 
-  const Uint32 count = NDBT_Tables::getNumTables();
+  const int count = NDBT_Tables::getNumTables();
   for (i=0; i < count; i++){
     const NdbDictionary::Table * tab = NDBT_Tables::getTable(i);
     pNdb->getDictionary()->createTable(* tab);
@@ -1541,7 +1541,7 @@ runTestDictionaryPerf(NDBT_Context* ctx,
     }
   }
 
-  const Uint32 times = 10000000;
+  const int times = 10000000;
 
   ndbout_c("%d tables and %d columns", 
 	   NDBT_Tables::getNumTables(), cols.size()/2);
@@ -1550,7 +1550,6 @@ runTestDictionaryPerf(NDBT_Context* ctx,
 
   srand(time(0));
   Uint32 size = cols.size() / 2;
-  char ** columns = &cols[0];
   Uint64 start = NdbTick_CurrentMillisecond();
   for(i = 0; i<times; i++){
     int j = 2 * (rand() % size);
@@ -1650,7 +1649,7 @@ runCreateDiskTable(NDBT_Context* ctx, ND
   NdbDictionary::Table tab = *ctx->getTab();
   tab.setTablespaceName("DEFAULT-TS");
   
-  for(Uint32 i = 0; i<tab.getNoOfColumns(); i++)
+  for(int i = 0; i<tab.getNoOfColumns(); i++)
     if(!tab.getColumn(i)->getPrimaryKey())
       tab.getColumn(i)->setStorageType(NdbDictionary::Column::StorageTypeDisk);
   
@@ -2137,7 +2136,7 @@ runBug21755(NDBT_Context* ctx, NDBT_Step
   idx0.setType(NdbDictionary::Index::OrderedIndex);
   idx0.setTable(pTab0.getName());
   idx0.setStoredIndex(false);
-  for (Uint32 i = 0; i<pTab0.getNoOfColumns(); i++)
+  for (int i = 0; i<pTab0.getNoOfColumns(); i++)
   {
     const NdbDictionary::Column * col = pTab0.getColumn(i);
     if(col->getPrimaryKey()){
@@ -2362,7 +2361,6 @@ runBug29186(NDBT_Context* ctx, NDBT_Step
 {
   int lgError = 15000;
   int tsError = 16000;
-  int res;
   char lgname[256];
   char ufname[256];
   char tsname[256];
@@ -2669,7 +2667,7 @@ RandSchemaOp::create_index(Ndb* ndb, Obj
   idx0.setTable(pTab->getName());
   idx0.setStoredIndex(ordered ? false : stored);
 
-  for (Uint32 i = 0; i<pTab->getNoOfColumns(); i++)
+  for (int i = 0; i<pTab->getNoOfColumns(); i++)
   {
     if (pTab->getColumn(i)->getPrimaryKey())
       idx0.addColumn(pTab->getColumn(i)->getName());
@@ -2843,7 +2841,7 @@ runDictRestart(NDBT_Context* ctx, NDBT_S
   if (res.init(ctx, step))
     return NDBT_FAILED;
   
-  for (Uint32 i = 0; i<loops; i++)
+  for (int i = 0; i<loops; i++)
   {
     for (Uint32 j = 0; j<10; j++)
       if (dict.schema_op(pNdb))