bk commit into 5.1 tree (jonas:1.2493)

[jonas]

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 16:05:40+02:00, jonas@stripped +5 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
  into  perch.ndb.mysql.com:/home/jonas/src/telco-6.1
  MERGE: 1.2403.11.17

  storage/ndb/include/ndbapi/NdbDictionary.hpp@stripped, 2007-04-12 16:04:58+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.87.1.1

  storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp@stripped, 2007-04-12 16:04:58+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.21.2.2

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp@stripped, 2007-04-12 16:04:58+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.157.1.3

  storage/ndb/test/ndbapi/testBasic.cpp@stripped, 2007-04-12 16:05:38+02:00, jonas@stripped +50 -50
    merge
    MERGE: 1.17.1.1

  storage/ndb/test/run-test/daily-basic-tests.txt@stripped, 2007-04-12 16:04:58+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.61.1.9

# 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/telco-6.1/RESYNC

--- 1.72/storage/ndb/test/run-test/daily-basic-tests.txt	2007-04-12 16:05:44 +02:00
+++ 1.73/storage/ndb/test/run-test/daily-basic-tests.txt	2007-04-12 16:05:44 +02:00
@@ -239,6 +239,10 @@
 cmd: testBasic
 args: -n Bug25090 T1
 
+max-time: 1000
+cmd: testBasic
+args: -n Bug27756
+
 max-time: 500
 cmd: testIndex
 args: -n Bug25059 -r 3000 T1

--- 1.88/storage/ndb/include/ndbapi/NdbDictionary.hpp	2007-04-12 16:05:44 +02:00
+++ 1.89/storage/ndb/include/ndbapi/NdbDictionary.hpp	2007-04-12 16:05:44 +02:00
@@ -535,6 +535,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.24/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp	2007-04-12 16:05:44 +02:00
+++ 1.25/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp	2007-04-12 16:05:44 +02:00
@@ -107,8 +107,7 @@
   /**
    * Release copy tuple
    */
-  if(regOperPtr->op_struct.op_type != ZDELETE && 
-     !regOperPtr->m_copy_tuple_location.isNull())
+  if(!regOperPtr->m_copy_tuple_location.isNull())
     c_undo_buffer.free_copy_tuple(&regOperPtr->m_copy_tuple_location);
   
   if (regOperPtr->op_struct.in_active_list) {

--- 1.160/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2007-04-12 16:05:44 +02:00
+++ 1.161/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2007-04-12 16:05:44 +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();
   }
@@ -5292,3 +5297,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.18/storage/ndb/test/ndbapi/testBasic.cpp	2007-04-12 16:05:44 +02:00
+++ 1.19/storage/ndb/test/ndbapi/testBasic.cpp	2007-04-12 16:05:44 +02:00
@@ -1318,6 +1318,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<Uint64> 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<copies.size(); i++)
+    if (copies[i] != copies.back())
+    {
+      ndbout_c("Memleak detected");
+      return NDBT_FAILED;
+    }
+  
+  return NDBT_OK;
+}
+
+template class Vector<Uint64>;
+
 NDBT_TESTSUITE(testBasic);
 TESTCASE("PkInsert", 
 	 "Verify that we can insert and delete from this table using PK"
@@ -1593,6 +1651,10 @@
   INITIALIZER(runLoadTable);
   INITIALIZER(runDeleteRead);
   FINALIZER(runClearTable2);
+}
+TESTCASE("Bug27756", 
+	 "Verify what happens when we fill the db" ){
+  STEP(runBug27756);
 }
 NDBT_TESTSUITE_END(testBasic);