bk commit into 5.1 tree (jonas:1.1980)

[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.1980 05/08/31 10:32:23 jonas@eel.(none) +5 -0
  ndb diskdata
    fix yet another abort case

  storage/ndb/src/kernel/blocks/tsman.cpp
    1.46 05/08/31 10:32:18 jonas@eel.(none) +1 -1
    Dont toggle bit on update_page_bits

  storage/ndb/src/kernel/blocks/pgman.cpp
    1.35 05/08/31 10:32:18 jonas@eel.(none) +3 -2
    Allow disorder during SR

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
    1.73 05/08/31 10:32:18 jonas@eel.(none) +1 -0
    mark as not in avtive list on abort log_space initial insert

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
    1.29 05/08/31 10:32:18 jonas@eel.(none) +2 -2
    Fix correct get extent

  storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp
    1.37 05/08/31 10:32:18 jonas@eel.(none) +1 -0
    Make sure it's not in active list on early_tupkey_error as it wont be removed...

# 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:	eel.(none)
# Root:	/home/jonas/src/mysql-5.1-ndb-dd

--- 1.28/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp	2005-08-25 09:29:04 +02:00
+++ 1.29/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp	2005-08-31 10:32:18 +02:00
@@ -1093,8 +1093,8 @@
   Disk_alloc_info& alloc= fragPtr.p->m_disk_alloc_info;
   
   Ptr<Extent_info> ext;
-  ndbrequire(c_extent_pool.getPtr(alloc.m_curr_extent_info_ptr_i));
-
+  c_extent_pool.getPtr(ext, alloc.m_curr_extent_info_ptr_i);
+  
   Uint32 size= alloc.calc_page_free_space(bits);  
   Uint32 old_size= alloc.calc_page_free_space(old_bits);
 

--- 1.34/storage/ndb/src/kernel/blocks/pgman.cpp	2005-08-26 13:26:48 +02:00
+++ 1.35/storage/ndb/src/kernel/blocks/pgman.cpp	2005-08-31 10:32:18 +02:00
@@ -499,7 +499,8 @@
       if (pl.m_cmp != 0 && prev_ptr.i != RNIL)
       {
         // require strict order
-        ndbrequire(pl.m_cmp(*prev_ptr.p, *ptr.p) < 0);
+        ndbrequire(getNodeState().startLevel != NodeState::SL_STARTED || 
+		   pl.m_cmp(*prev_ptr.p, *ptr.p) < 0);
       }
       prev_ptr = ptr;
       ptr.i = ptr.p->m_next_entry_i[pl.m_off];
@@ -635,7 +636,7 @@
 Pgman::execLCP_FRAG_ORD(Signal* signal)
 {
   LcpFragOrd* ord = (LcpFragOrd*)signal->getDataPtr();
-  ndbrequire(ord->lcpId == m_last_lcp_complete + 1 || m_last_lcp_complete == 0);
+  ndbrequire(ord->lcpId >= m_last_lcp_complete + 1 || m_last_lcp_complete == 0);
   m_last_lcp = ord->lcpId;
 
   m_lcp_on = true;

--- 1.45/storage/ndb/src/kernel/blocks/tsman.cpp	2005-08-29 10:23:09 +02:00
+++ 1.46/storage/ndb/src/kernel/blocks/tsman.cpp	2005-08-31 10:32:18 +02:00
@@ -1317,7 +1317,7 @@
     /**
      * Toggle word
      */
-    bit |= 1 << (SZ - 1);
+    bit |= header->get_free_bits(page_no_in_extent) & (1 << (SZ - 1));
     header->update_free_bits(page_no_in_extent, bit);
     
 #ifdef VM_TRACE

--- 1.36/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp	2005-08-31 06:46:10 +02:00
+++ 1.37/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp	2005-08-31 10:32:18 +02:00
@@ -300,6 +300,7 @@
 void Dbtup::early_tupkey_error(Signal* signal)
 {
   Operationrec * const regOperPtr = operPtr.p;
+  ndbrequire(!regOperPtr->op_struct.in_active_list);
   set_trans_state(regOperPtr, TRANS_IDLE);
   set_tuple_state(regOperPtr, TUPLE_PREPARED);
   initOpConnection(regOperPtr);

--- 1.72/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2005-08-31 08:41:50 +02:00
+++ 1.73/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2005-08-31 10:32:18 +02:00
@@ -1455,6 +1455,7 @@
   return -1;
 
 log_space_error:
+  regOperPtr.p->op_struct.in_active_list = false;
   early_tupkey_error(signal);
   return -1;
 }