bk commit into 5.1 tree (jonas:1.2578)

[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:00:51+02:00, jonas@stripped +11 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
  MERGE: 1.2403.19.17

  storage/ndb/include/kernel/AttributeHeader.hpp@stripped, 2007-04-12 16:00:49+02:00,
jonas@stripped +1 -2
    merge
    MERGE: 1.15.1.1

  storage/ndb/include/ndbapi/NdbDictionary.hpp@stripped, 2007-04-12 16:00:49+02:00,
jonas@stripped +1 -1
    merge
    MERGE: 1.87.1.1

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

  storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp@stripped, 2007-04-12 15:57:03+02:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.32.2.1

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp@stripped, 2007-04-12 16:00:49+02:00,
jonas@stripped +6 -6
    merge
    MERGE: 1.157.1.3

  storage/ndb/src/ndbapi/ndb_cluster_connection.cpp@stripped, 2007-04-12 16:00:49+02:00,
jonas@stripped +3 -3
    merge
    MERGE: 1.47.1.1

  storage/ndb/test/include/HugoOperations.hpp@stripped, 2007-04-12 15:57:03+02:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.19.1.1

  storage/ndb/test/ndbapi/testBasic.cpp@stripped, 2007-04-12 16:00:49+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 15:57:03+02:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.63.1.7

  storage/ndb/test/src/HugoOperations.cpp@stripped, 2007-04-12 15:57:03+02:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.29.1.1

  storage/ndb/test/src/HugoTransactions.cpp@stripped, 2007-04-12 15:57:03+02:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.31.1.1

# 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/mysql-5.1-new-ndb/RESYNC

--- 1.77/storage/ndb/test/run-test/daily-basic-tests.txt	2007-04-12 16:00:57 +02:00
+++ 1.78/storage/ndb/test/run-test/daily-basic-tests.txt	2007-04-12 16:00:57 +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.17/storage/ndb/include/kernel/AttributeHeader.hpp	2007-04-12 16:00:57 +02:00
+++ 1.18/storage/ndb/include/kernel/AttributeHeader.hpp	2007-04-12 16:00:57 +02:00
@@ -47,6 +47,7 @@
   STATIC_CONST( FRAGMENT_VARSIZED_MEMORY = 0xFFF4 );
   // 0xFFF3  to be used for read packed when merged
   STATIC_CONST( ANY_VALUE    = 0xFFF2 );
+  STATIC_CONST( COPY_ROWID   = 0xFFF1 );
   
   // NOTE: in 5.1 ctors and init take size in bytes
 

--- 1.91/storage/ndb/include/ndbapi/NdbDictionary.hpp	2007-04-12 16:00:57 +02:00
+++ 1.92/storage/ndb/include/ndbapi/NdbDictionary.hpp	2007-04-12 16:00:57 +02:00
@@ -535,6 +535,7 @@
     static const Column * ROWID;
     static const Column * ROW_GCI;
     static const Column * ANY_VALUE;
+    static const Column * COPY_ROWID;
     
     int getSizeInBytes() const;
 #endif

--- 1.26/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp	2007-04-12 16:00:57 +02:00
+++ 1.27/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp	2007-04-12 16:00:57 +02:00
@@ -105,8 +105,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.35/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp	2007-04-12 16:00:57 +02:00
+++ 1.36/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp	2007-04-12 16:00:57 +02:00
@@ -1214,6 +1214,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.168/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2007-04-12 16:00:57 +02:00
+++ 1.169/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2007-04-12 16:00:57 +02:00
@@ -383,6 +383,11 @@
     col->m_impl.m_attrId = AttributeHeader::ANY_VALUE;
     col->m_impl.m_attrSize = 4;
     col->m_impl.m_arraySize = 1;
+  } 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();
   }
@@ -5288,3 +5293,4 @@
 const NdbDictionary::Column * NdbDictionary::Column::ROWID = 0;
 const NdbDictionary::Column * NdbDictionary::Column::ROW_GCI = 0;
 const NdbDictionary::Column * NdbDictionary::Column::ANY_VALUE = 0;
+const NdbDictionary::Column * NdbDictionary::Column::COPY_ROWID = 0;

--- 1.20/storage/ndb/test/include/HugoOperations.hpp	2007-04-12 16:00:57 +02:00
+++ 1.21/storage/ndb/test/include/HugoOperations.hpp	2007-04-12 16:00:57 +02:00
@@ -83,6 +83,8 @@
   int equalForAttr(NdbOperation*,
 		   int attrId, 
 		   int rowId);
+
+  int equalForRow(NdbOperation*, int rowid);
   
   int setValues(NdbOperation*, int rowId, int updateId);
   

--- 1.18/storage/ndb/test/ndbapi/testBasic.cpp	2007-04-12 16:00:57 +02:00
+++ 1.19/storage/ndb/test/ndbapi/testBasic.cpp	2007-04-12 16:00:57 +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);
 

--- 1.31/storage/ndb/test/src/HugoOperations.cpp	2007-04-12 16:00:57 +02:00
+++ 1.32/storage/ndb/test/src/HugoOperations.cpp	2007-04-12 16:00:57 +02:00
@@ -111,14 +111,8 @@
     }
     
     // Define primary keys
-    for(a = 0; a<tab.getNoOfColumns(); a++){
-      if (tab.getColumn(a)->getPrimaryKey() == true){
-	if(equalForAttr(pOp, a, r+recordNo) != 0){
-	  ERR(pTrans->getNdbError());
-	  return NDBT_FAILED;
-	}
-      }
-    }
+    if (equalForRow(pOp, r+recordNo) != 0)
+      return NDBT_FAILED;
 
     if(pIndexScanOp)
       pIndexScanOp->end_of_bound(r);
@@ -143,7 +137,6 @@
 				   int recordNo,
 				   int numRecords,
 				   int updatesValue){
-  int a; 
   allocRows(numRecords);
   int check;
   for(int r=0; r < numRecords; r++){
@@ -172,14 +165,8 @@
 {
   // Define primary keys
   int a;
-  for(a = 0; a<tab.getNoOfColumns(); a++){
-    if (tab.getColumn(a)->getPrimaryKey() == true){
-      if(equalForAttr(pOp, a, rowId) != 0){
-	ERR(pTrans->getNdbError());
-	return NDBT_FAILED;
-      }
-    }
-  }
+  if (equalForRow(pOp, rowId) != 0)
+    return NDBT_FAILED;
   
   for(a = 0; a<tab.getNoOfColumns(); a++){
     if (tab.getColumn(a)->getPrimaryKey() == false){
@@ -198,7 +185,7 @@
 				   int numRecords,
 				   int updatesValue){
   
-  int a, check;
+  int check;
   for(int r=0; r < numRecords; r++){
     NdbOperation* pOp = getOperation(pTrans, NdbOperation::InsertRequest);
     if (pOp == NULL) {
@@ -240,14 +227,8 @@
     }
     
     // Define primary keys
-    for(a = 0; a<tab.getNoOfColumns(); a++){
-      if (tab.getColumn(a)->getPrimaryKey() == true){
-	if(equalForAttr(pOp, a, r+recordNo) != 0){
-	  ERR(pTrans->getNdbError());
-	  return NDBT_FAILED;
-	}
-      }
-    }
+    if (equalForRow(pOp, r+recordNo) != 0)
+      return NDBT_FAILED;
     
     // Define attributes to update
     for(a = 0; a<tab.getNoOfColumns(); a++){
@@ -266,7 +247,7 @@
 					 int recordNo,
 					 int numRecords){
   
-  int a, check;
+  int check;
   for(int r=0; r < numRecords; r++){
     NdbOperation* pOp = pTrans->getNdbOperation(tab.getName());	
     if (pOp == NULL) {
@@ -281,14 +262,8 @@
     }
     
     // Define primary keys
-    for(a = 0; a<tab.getNoOfColumns(); a++){
-      if (tab.getColumn(a)->getPrimaryKey() == true){
-	if(equalForAttr(pOp, a, r+recordNo) != 0){
-	  ERR(pTrans->getNdbError());
-	  return NDBT_FAILED;
-	}
-      }
-    }
+    if (equalForRow(pOp, r+recordNo) != 0)
+      return NDBT_FAILED;
   }
   return NDBT_OK;
 }
@@ -297,7 +272,7 @@
 				   int recordNo,
 				   int numRecords){
   
-  int a, check;
+  int check;
   for(int r=0; r < numRecords; r++){
     NdbOperation* pOp = getOperation(pTrans, NdbOperation::DeleteRequest);
     if (pOp == NULL) {
@@ -312,14 +287,8 @@
     }
     
     // Define primary keys
-    for(a = 0; a<tab.getNoOfColumns(); a++){
-      if (tab.getColumn(a)->getPrimaryKey() == true){
-	if(equalForAttr(pOp, a, r+recordNo) != 0){
-	  ERR(pTrans->getNdbError());
-	  return NDBT_FAILED;
-	}
-      }
-    }
+    if (equalForRow(pOp, r+recordNo) != 0)
+      return NDBT_FAILED;
   }
   return NDBT_OK;
 }
@@ -521,6 +490,22 @@
   }
 }
 
+int
+HugoOperations::equalForRow(NdbOperation* pOp, int row)
+{
+  for(int a = 0; a<tab.getNoOfColumns(); a++)
+  {
+    if (tab.getColumn(a)->getPrimaryKey() == true)
+    {
+      if(equalForAttr(pOp, a, row) != 0)
+      {
+        ERR(pOp->getNdbError());
+        return NDBT_FAILED;
+      }
+    }
+  }
+  return NDBT_OK;
+}
 
 int HugoOperations::equalForAttr(NdbOperation* pOp,
 				   int attrId, 
@@ -679,14 +664,8 @@
     }
     
     // Define primary keys
-    for(a = 0; a<tab.getNoOfColumns(); a++){
-      if (tab.getColumn(a)->getPrimaryKey() == true){
-	if(equalForAttr(pOp, a, r+recordNo) != 0){
-	  ERR(pTrans->getNdbError());
-	  return NDBT_FAILED;
-	}
-      }
-    }
+    if (equalForRow(pOp, r+recordNo) != 0)
+      return NDBT_FAILED;
     
     // Define attributes to read  
     for(a = 0; a<tab.getNoOfColumns(); a++){
@@ -723,14 +702,8 @@
     }
     
     // Define primary keys
-    for(a = 0; a<tab.getNoOfColumns(); a++){
-      if (tab.getColumn(a)->getPrimaryKey() == true){
-	if(equalForAttr(pOp, a, r+recordNo) != 0){
-	  ERR(pTrans->getNdbError());
-	  return NDBT_FAILED;
-	}
-      }
-    }
+    if (equalForRow(pOp, r+recordNo) != 0)
+      return NDBT_FAILED;
     
     // Define attributes to update
     for(a = 0; a<tab.getNoOfColumns(); a++){

--- 1.33/storage/ndb/test/src/HugoTransactions.cpp	2007-04-12 16:00:57 +02:00
+++ 1.34/storage/ndb/test/src/HugoTransactions.cpp	2007-04-12 16:00:57 +02:00
@@ -520,10 +520,9 @@
                             bool oneTrans,
 			    int value,
 			    bool abort){
-  int             check, a;
+  int             check;
   int             retryAttempt = 0;
   int             retryMax = 5;
-  NdbOperation	  *pOp;
   bool            first_batch = true;
 
   const int org = batch;
@@ -667,10 +666,9 @@
 int
 HugoTransactions::fillTable(Ndb* pNdb, 
 			    int batch){
-  int             check, a, b;
+  int             check;
   int             retryAttempt = 0;
   int             retryMax = 5;
-  NdbOperation	  *pOp;
 
   const int org = batch;
   const int cols = tab.getNoOfColumns();
@@ -791,7 +789,7 @@
   int                  reads = 0;
   int                  r = 0;
   int                  retryAttempt = 0;
-  int                  check, a;
+  int                  check;
 
   if (batch == 0) {
     g_info << "ERROR: Argument batch == 0 in pkReadRecords(). Not allowed."
<< endl;
@@ -910,8 +908,7 @@
   int updated = 0;
   int                  r = 0;
   int                  retryAttempt = 0;
-  int                  check, a, b;
-  NdbOperation	       *pOp;
+  int                  check, b;
 
   allocRows(batch);
 
@@ -1097,14 +1094,10 @@
    }
    
    // Define primary keys
-   for(a = 0; a<tab.getNoOfColumns(); a++){
-     if (tab.getColumn(a)->getPrimaryKey() == true){
-       if(equalForAttr(pOp, a, r) != 0){
-	 ERR(pTrans->getNdbError());
-	 closeTransaction(pNdb);
-	 return NDBT_FAILED;
-       }
-     }
+   if (equalForRow(pOp, r) != 0)
+   {
+     closeTransaction(pNdb);
+     return NDBT_FAILED;
    }
    
    // Read update value
@@ -1153,14 +1146,10 @@
     }
 
     // PKs
-    for(a = 0; a<tab.getNoOfColumns(); a++){
-      if (tab.getColumn(a)->getPrimaryKey() == true){
-	if(equalForAttr(pUpdOp, a, r) != 0){
-	  ERR(pTrans->getNdbError());
-	  closeTransaction(pNdb);
-	  return NDBT_FAILED;
-	}
-      }
+    if (equalForRow(pOp, r) != 0)
+    {
+      closeTransaction(pNdb);
+      return NDBT_FAILED;
     }
 
     // Update col
@@ -1236,8 +1225,7 @@
   int deleted = 0;
   int                  r = 0;
   int                  retryAttempt = 0;
-  int                  check, a;
-  NdbOperation	       *pOp;
+  int                  check;
 
   g_info << "|- Deleting records..." << endl;
   while (r < records){
@@ -1335,8 +1323,7 @@
   // and lock som other records
   int                  r = 0;
   int                  retryAttempt = 0;
-  int                  check, a, b;
-  NdbOperation	       *pOp;
+  int                  check;
   NdbOperation::LockMode lm = NdbOperation::LM_Exclusive;
 
   // Calculate how many records to lock in each batch
@@ -1522,14 +1509,10 @@
       }
       
       // Define primary keys
-      for(a = 0; a<tab.getNoOfColumns(); a++){
-	if (tab.getColumn(a)->getPrimaryKey() == true){
-	  if(equalForAttr(pOp, a, r+b) != 0){
-	    ERR(pTrans->getNdbError());
-	    closeTransaction(pNdb);
-	    return NDBT_FAILED;
-	  }
-	}
+      if (equalForRow(pOp, r+b) != 0)
+      {
+        closeTransaction(pNdb);
+        return NDBT_FAILED;
       }
       
       // Define attributes to read  
@@ -1663,14 +1646,10 @@
       }	
       
       // Define primary keys
-      for(a = 0; a<tab.getNoOfColumns(); a++){
-	if (tab.getColumn(a)->getPrimaryKey() == true){
-	  if(equalForAttr(pOp, a, r+b) != 0){
-	    ERR(pTrans->getNdbError());
-	    closeTransaction(pNdb);
-	    return NDBT_FAILED;
-	  }
-	}
+      if (equalForRow(pOp, r+b) != 0)
+      {
+        closeTransaction(pNdb);
+        return NDBT_FAILED;
       }
       
       // Define attributes to read  
@@ -1733,16 +1712,13 @@
 	return NDBT_FAILED;
       }
       
-      if(!ordered){
-	for(a = 0; a<tab.getNoOfColumns(); a++){
-	  if (tab.getColumn(a)->getPrimaryKey() == true){
-	    if(equalForAttr(pUpdOp, a, r+b) != 0){
-	      ERR(pTrans->getNdbError());
-	      closeTransaction(pNdb);
-	      return NDBT_FAILED;
-	    }
-	  }
-	}
+      if(!ordered)
+      {
+        if (equalForRow(pOp, r+b) != 0)
+        {
+          closeTransaction(pNdb);
+          return NDBT_FAILED;
+        }
       }
       
       for(a = 0; a<tab.getNoOfColumns(); a++){

--- 1.52/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp	2007-04-12 16:00:57 +02:00
+++ 1.53/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp	2007-04-12 16:00:57 +02:00
@@ -330,6 +330,8 @@
       NdbColumnImpl::create_pseudo("NDB$ROW_GCI");
     NdbDictionary::Column::ANY_VALUE= 
       NdbColumnImpl::create_pseudo("NDB$ANY_VALUE");
+    NdbDictionary::Column::COPY_ROWID= 
+      NdbColumnImpl::create_pseudo("NDB$COPY_ROWID");
   }
   NdbMutex_Unlock(g_ndb_connection_mutex);
 
@@ -397,6 +399,9 @@
     NdbDictionary::Column::ROWID= 0;
     NdbDictionary::Column::ROW_GCI= 0;
     NdbDictionary::Column::ANY_VALUE= 0;
+
+    delete NdbDictionary::Column::COPY_ROWID;
+    NdbDictionary::Column::COPY_ROWID = 0;
   }
   NdbMutex_Unlock(g_ndb_connection_mutex);