bk commit into 5.1 tree (jonas:1.2461) BUG#27756

[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 15:55:39+02:00, jonas@stripped +2 -0
  ndb - bug#27756
    make sure that copy tuple is released in all cases

  storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp@stripped, 2007-04-12 15:55:37+02:00, jonas@stripped +1 -2
    make sure that copy tuple is released in all cases

  storage/ndb/test/run-test/daily-basic-tests.txt@stripped, 2007-04-12 15:55:37+02:00, jonas@stripped +4 -0
    add testcase

# 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.69/storage/ndb/test/run-test/daily-basic-tests.txt	2007-04-12 15:55:44 +02:00
+++ 1.70/storage/ndb/test/run-test/daily-basic-tests.txt	2007-04-12 15:55:44 +02:00
@@ -235,6 +235,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.22/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp	2007-04-12 15:55:44 +02:00
+++ 1.23/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp	2007-04-12 15:55: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) {