bk commit into 5.1 tree (jonas:1.1981)

[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
  1.1981 06/01/02 11:33:06 jonas@stripped +2 -0
  ndb - opt nr
    fix free bit handling (flexHammer)

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
    1.37 06/01/02 11:33:03 jonas@stripped +5 -3
    Clear free bit in handleInsert...

  storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
    1.13 06/01/02 11:33:03 jonas@stripped +1 -1
    Clear FREE bit on commit

# 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-ndb

--- 1.12/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp	2005-12-28 12:55:45 +01:00
+++ 1.13/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp	2006-01-02 11:33:03 +01:00
@@ -287,7 +287,7 @@
   
   
   Uint32 clear= 
-    Tuple_header::ALLOC |
+    Tuple_header::ALLOC | Tuple_header::FREE |
     Tuple_header::DISK_ALLOC | Tuple_header::DISK_INLINE | 
     Tuple_header::MM_SHRINK | Tuple_header::MM_GROWN;
   copy_bits &= ~(Uint32)clear;

--- 1.36/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2005-12-28 12:55:45 +01:00
+++ 1.37/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2006-01-02 11:33:03 +01:00
@@ -846,8 +846,8 @@
   req_struct->m_page_ptr = page_ptr;
   req_struct->m_tuple_ptr = (Tuple_header*)ptr;
   
-  ndbassert(! (req_struct->m_tuple_ptr->m_header_bits & Tuple_header::FREE));
-
+  ndbassert(regOperPtr->op_struct.op_type == ZINSERT || (! (req_struct->m_tuple_ptr->m_header_bits & Tuple_header::FREE)));
+  
   req_struct->check_offset[MM]= regTabPtr->get_check_offset(MM);
   req_struct->check_offset[DD]= regTabPtr->get_check_offset(DD);
   
@@ -1401,6 +1401,7 @@
       goto size_change_error;
     }
     req_struct->m_use_rowid = false;
+    base->m_header_bits &= ~(Uint32)Tuple_header::FREE;
   }
   else
   {
@@ -1408,6 +1409,7 @@
 	 req_struct->m_row_id.m_page_idx == regOperPtr.p->m_tuple_location.m_page_idx))
     {
       ndbout_c("no mem insert but rowid (same)");
+      base->m_header_bits &= ~(Uint32)Tuple_header::FREE;
     }
     else
     {
@@ -1427,7 +1429,7 @@
       terrorCode = 1601;
       goto disk_prealloc_error;
     }
-
+    
     int ret= disk_page_prealloc(signal, fragPtr, &tmp, size);
     if (unlikely(ret < 0))
     {