bk commit into 5.1 tree (jonas:1.2349) BUG#21948

[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, 2006-12-08 10:24:48+01:00, jonas@stripped +2 -0
  ndb - bug#21948
    Fix bug in previous changeset...causing SR problems with disk

  storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp@stripped, 2006-12-08 10:24:46+01:00, jonas@stripped +18 -3
    fix some more strict-aliasing problems

  storage/ndb/src/kernel/blocks/tsman.cpp@stripped, 2006-12-08 10:24:46+01:00, jonas@stripped +1 -0
    Fix newly introduced bug

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

--- 1.11/storage/ndb/src/kernel/blocks/tsman.cpp	2006-12-08 10:24:52 +01:00
+++ 1.12/storage/ndb/src/kernel/blocks/tsman.cpp	2006-12-08 10:24:52 +01:00
@@ -1470,6 +1470,7 @@
        */
       ndbassert(extent >= per_page);
       preq.m_page.m_page_no = data_off + size * (extent - /* zero */ per_page);
+      preq.m_page.m_page_idx = extent; // extent_no
       
       AllocExtentReq* rep = (AllocExtentReq*)signal->getDataPtr();
       rep->reply.errorCode = 0;

--- 1.18/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp	2006-12-08 10:24:52 +01:00
+++ 1.19/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp	2006-12-08 10:24:52 +01:00
@@ -176,8 +176,11 @@
   {
     Local_key disk;
     memcpy(&disk, ptr->get_disk_ref_ptr(regTabPtr), sizeof(disk));
+    PagePtr tmpptr;
+    tmpptr.i = m_pgman.m_ptr.i;
+    tmpptr.p = reinterpret_cast<Page*>(m_pgman.m_ptr.p);
     disk_page_free(signal, regTabPtr, regFragPtr, 
-		   &disk, *(PagePtr*)&m_pgman.m_ptr, gci);
+		   &disk, tmpptr, gci);
   }
   
   if (! (bits & Tuple_header::LCP_SKIP) && lcpScan_ptr_i != RNIL)
@@ -356,7 +359,12 @@
   regOperPtr.p->m_commit_disk_callback_page= page_id;
   m_global_page_pool.getPtr(m_pgman.m_ptr, page_id);
   
-  disk_page_set_dirty(*(Ptr<Page>*)&m_pgman.m_ptr);
+  {
+    PagePtr tmp;
+    tmp.i = m_pgman.m_ptr.i;
+    tmp.p = reinterpret_cast<Page*>(m_pgman.m_ptr.p);
+    disk_page_set_dirty(tmp);
+  }
   
   execTUP_COMMITREQ(signal);
   if(signal->theData[0] == 0)
@@ -543,7 +551,14 @@
       break;
     }
     get_page = true;
-    disk_page_set_dirty(*(Ptr<Page>*)&m_pgman.m_ptr);
+
+    {
+      PagePtr tmpptr;
+      tmpptr.i = m_pgman.m_ptr.i;
+      tmpptr.p = reinterpret_cast<Page*>(m_pgman.m_ptr.p);
+      disk_page_set_dirty(tmpptr);
+    }
+    
     regOperPtr.p->m_commit_disk_callback_page= res;
     regOperPtr.p->op_struct.m_load_diskpage_on_commit= 0;
   }