From: Date: April 12 2007 11:47am Subject: bk commit into 5.1 tree (jonas:1.2460) BUG#27756 List-Archive: http://lists.mysql.com/commits/24370 X-Bug: 27756 Message-Id: <20070412094743.B6F2F7D629@perch.ndb.mysql.com> Below is the list of changes that have just been committed into a local 5.1 repository of jonas. When jonas 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, 2007-04-12 11:47:38+02:00, jonas@stripped +6 -0 ndb - bug#27756 testcase only new pseudo column NDB$COPY_ROWID storage/ndb/include/kernel/AttributeHeader.hpp@stripped, 2007-04-12 11:47:36+02:00, jonas@stripped +2 -0 Add new pseudo column for reading location of copy tuple storage/ndb/include/ndbapi/NdbDictionary.hpp@stripped, 2007-04-12 11:47:36+02:00, jonas@stripped +1 -0 Add new pseudo column for reading location of copy tuple storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp@stripped, 2007-04-12 11:47:36+02:00, jonas@stripped +4 -0 Add new pseudo column for reading location of copy tuple storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp@stripped, 2007-04-12 11:47:36+02:00, jonas@stripped +6 -0 Add new pseudo column for reading location of copy tuple storage/ndb/src/ndbapi/ndb_cluster_connection.cpp@stripped, 2007-04-12 11:47:36+02:00, jonas@stripped +5 -0 Add new pseudo column for reading location of copy tuple storage/ndb/test/ndbapi/testBasic.cpp@stripped, 2007-04-12 11:47:36+02:00, jonas@stripped +62 -0 add testcase for bug#27756 # 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: jonas # Host: perch.ndb.mysql.com # Root: /home/jonas/src/51-telco-gca --- 1.15/storage/ndb/include/kernel/AttributeHeader.hpp 2007-04-12 11:47:43 +02:00 +++ 1.16/storage/ndb/include/kernel/AttributeHeader.hpp 2007-04-12 11:47:43 +02:00 @@ -46,6 +46,8 @@ STATIC_CONST( ROW_GCI = 0xFFF5 ); STATIC_CONST( FRAGMENT_VARSIZED_MEMORY = 0xFFF4 ); + STATIC_CONST( COPY_ROWID = 0xFFF1 ); + // NOTE: in 5.1 ctors and init take size in bytes /** Initialize AttributeHeader at location aHeaderPtr */ --- 1.87/storage/ndb/include/ndbapi/NdbDictionary.hpp 2007-04-12 11:47:43 +02:00 +++ 1.88/storage/ndb/include/ndbapi/NdbDictionary.hpp 2007-04-12 11:47:43 +02:00 @@ -534,6 +534,7 @@ static const Column * RECORDS_IN_RANGE; static const Column * ROWID; static const Column * ROW_GCI; + static const Column * COPY_ROWID; int getSizeInBytes() const; #endif --- 1.32/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp 2007-04-12 11:47:43 +02:00 +++ 1.33/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp 2007-04-12 11:47:43 +02:00 @@ -1198,6 +1198,10 @@ return 2; } return 0; + case AttributeHeader::COPY_ROWID: + outBuffer[0] = operPtr.p->m_copy_tuple_location.m_page_no; + outBuffer[0] = operPtr.p->m_copy_tuple_location.m_page_idx; + return 2; default: return 0; } --- 1.159/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp 2007-04-12 11:47:43 +02:00 +++ 1.160/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp 2007-04-12 11:47:43 +02:00 @@ -378,6 +378,11 @@ col->m_impl.m_attrSize = 8; col->m_impl.m_arraySize = 1; col->m_impl.m_nullable = true; + } else if(!strcmp(name, "NDB$COPY_ROWID")){ + col->setType(NdbDictionary::Column::Bigunsigned); + col->m_impl.m_attrId = AttributeHeader::COPY_ROWID; + col->m_impl.m_attrSize = 4; + col->m_impl.m_arraySize = 2; } else { abort(); } @@ -5089,3 +5094,4 @@ const NdbDictionary::Column * NdbDictionary::Column::RECORDS_IN_RANGE = 0; const NdbDictionary::Column * NdbDictionary::Column::ROWID = 0; const NdbDictionary::Column * NdbDictionary::Column::ROW_GCI = 0; +const NdbDictionary::Column * NdbDictionary::Column::COPY_ROWID = 0; --- 1.17/storage/ndb/test/ndbapi/testBasic.cpp 2007-04-12 11:47:43 +02:00 +++ 1.18/storage/ndb/test/ndbapi/testBasic.cpp 2007-04-12 11:47:43 +02:00 @@ -1272,6 +1272,64 @@ return NDBT_OK; } +int +runBug27756(NDBT_Context* ctx, NDBT_Step* step) +{ + + Ndb* pNdb = GETNDB(step); + NdbDictionary::Dictionary * dict = pNdb->getDictionary(); + + HugoOperations ops(*ctx->getTab()); + + int loops = ctx->getNumLoops(); + const int rows = ctx->getNumRecords(); + + Vector copies; + while (loops--) + { + ops.startTransaction(pNdb); + ops.pkInsertRecord(pNdb, 1, 1); + ops.execute_NoCommit(pNdb); + + NdbTransaction* pTrans = ops.getTransaction(); + NdbOperation* op = pTrans->getNdbOperation(ctx->getTab()->getName()); + op->interpretedUpdateTuple(); + ops.equalForRow(op, 1); + NdbRecAttr* attr = op->getValue(NdbDictionary::Column::COPY_ROWID); + ops.execute_NoCommit(pNdb); + + copies.push_back(attr->u_64_value()); + ndbout_c("copy at: %llx", copies.back()); + ops.execute_NoCommit(pNdb); + + ops.pkDeleteRecord(pNdb, 1, 1); + ops.execute_NoCommit(pNdb); + + if (loops & 1) + { + ops.execute_Rollback(pNdb); + ops.closeTransaction(pNdb); + } + else + { + ops.execute_Commit(pNdb); + ops.closeTransaction(pNdb); + ops.clearTable(pNdb, 100); + } + } + + for (Uint32 i = 0; i; + NDBT_TESTSUITE(testBasic); TESTCASE("PkInsert", "Verify that we can insert and delete from this table using PK" @@ -1541,6 +1599,10 @@ TESTCASE("Bug25090", "Verify what happens when we fill the db" ){ STEP(runBug25090); +} +TESTCASE("Bug27756", + "Verify what happens when we fill the db" ){ + STEP(runBug27756); } NDBT_TESTSUITE_END(testBasic); --- 1.47/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp 2007-04-12 11:47:43 +02:00 +++ 1.48/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp 2007-04-12 11:47:43 +02:00 @@ -326,6 +326,8 @@ NdbColumnImpl::create_pseudo("NDB$ROWID"); NdbDictionary::Column::ROW_GCI= NdbColumnImpl::create_pseudo("NDB$ROW_GCI"); + NdbDictionary::Column::COPY_ROWID= + NdbColumnImpl::create_pseudo("NDB$COPY_ROWID"); } NdbMutex_Unlock(g_ndb_connection_mutex); @@ -391,6 +393,9 @@ NdbDictionary::Column::RECORDS_IN_RANGE= 0; NdbDictionary::Column::ROWID= 0; NdbDictionary::Column::ROW_GCI= 0; + + delete NdbDictionary::Column::COPY_ROWID; + NdbDictionary::Column::COPY_ROWID = 0; } NdbMutex_Unlock(g_ndb_connection_mutex);