Return-Path: Received: from mailget.mysql.com ([unix socket]) by mailget (Cyrus v2.3.1-Invoca-RPM-2.3.1-2.8.fc5) with LMTPA; Mon, 07 Apr 2008 21:49:20 +0200 X-Sieve: CMU Sieve 2.3 Received: from mail.mysql.com (mail.mysql.com [10.100.1.21]) by mailget.mysql.com (8.13.8/8.13.8) with ESMTP id m37Jn8n2027715 for ; Mon, 7 Apr 2008 21:49:09 +0200 Received: from mailgate-b.mysql.com (mailgate-b.mysql.com [10.128.18.33]) by mail.mysql.com (8.13.3/8.13.3) with ESMTP id m37Jn5ej009491 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 7 Apr 2008 21:49:06 +0200 Received: from lists.mysql.com (lists.mysql.com [10.100.1.37]) by mailgate-b.mysql.com (8.13.8/8.13.8) with SMTP id m37Jn5sF001777 for ; Mon, 7 Apr 2008 21:49:05 +0200 Received: (qmail 25747 invoked by uid 510); 7 Apr 2008 19:49:02 -0000 Mailing-List: contact commits-help@lists.mysql.com; run by ezmlm List-ID: Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Archive: http://lists.mysql.com/commits/45021 Delivered-To: mailing list commits@lists.mysql.com Received: (qmail 25722 invoked by uid 509); 7 Apr 2008 19:49:02 -0000 Date: Mon, 7 Apr 2008 21:50:18 +0200 Message-Id: <200804071950.m37JoIW7016094@ndb15.mysql.com> From: jmiller@mysql.com To: commits@lists.mysql.com Subject: bk commit into 5.1 tree (jmiller:1.2562) X-CSetKey: X-Cxn-Txn: 45177024,24328986 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@1.2562, 2008-04-07 21:50:11+02:00, jmiller@mysql.com +2 -0 testDict.cpp, testBlobs.cpp: Updated to remove compile warnings storage/ndb/test/ndbapi/testBlobs.cpp@1.41, 2008-04-07 21:49:48+02:00, jmiller@mysql.com +3 -3 Updated to remove compile warnings storage/ndb/test/ndbapi/testDict.cpp@1.42, 2008-04-07 21:49:59+02:00, jmiller@mysql.com +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; idropTable(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; igetTab(); tab.setTablespaceName("DEFAULT-TS"); - for(Uint32 i = 0; igetPrimaryKey()) 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; igetPrimaryKey()){ @@ -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; igetNoOfColumns(); i++) + for (int i = 0; igetNoOfColumns(); 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