List:Commits« Previous MessageNext Message »
From:knielsen Date:January 12 2006 2:40pm
Subject:bk commit into 5.1 tree (knielsen:1.2045)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen 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.2045 06/01/12 15:40:38 knielsen@stripped +6 -0
  Sun compiler fixes.

  storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp
    1.2 06/01/12 15:39:45 knielsen@stripped +2 -0
    Add missing return value, otherwise Sun compiler complains.

  storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
    1.19 06/01/12 15:38:30 knielsen@stripped +18 -18
    Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
    are the same function.

  storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
    1.27 06/01/12 15:38:30 knielsen@stripped +1 -1
    Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
    are the same function.

  storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp
    1.5 06/01/12 15:38:30 knielsen@stripped +4 -4
    Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
    are the same function.

  storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp
    1.5 06/01/12 15:38:29 knielsen@stripped +2 -2
    Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
    are the same function.

  storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp
    1.11 06/01/12 15:38:29 knielsen@stripped +1 -1
    Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
    are the same function.

# 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:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/mysql-5.1-new

--- 1.1/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp	2006-01-11 11:35:20 +01:00
+++ 1.2/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp	2006-01-12 15:39:45 +01:00
@@ -83,6 +83,8 @@
     
     release(start+1, end - 1 - start);    
   }
+
+  return 0;
 }
 
 void

--- 1.10/storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp	2005-11-07 12:19:07 +01:00
+++ 1.11/storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp	2006-01-12 15:38:29 +01:00
@@ -132,7 +132,7 @@
 void Dbtup::sendReadAttrinfo(Signal* signal,
                              KeyReqStruct *req_struct,
                              Uint32 ToutBufIndex,
-                             const Operationrec * const regOperPtr)
+                             const Operationrec *regOperPtr)
 {
   if(ToutBufIndex == 0)
     return;

--- 1.4/storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp	2006-01-11 09:26:03 +01:00
+++ 1.5/storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp	2006-01-12 15:38:29 +01:00
@@ -242,8 +242,8 @@
 }
 
 Uint32*
-Dbtup::alloc_fix_rowid(Fragrecord* const regFragPtr,
-		       Tablerec* const regTabPtr,
+Dbtup::alloc_fix_rowid(Fragrecord* regFragPtr,
+		       Tablerec* regTabPtr,
 		       Local_key* key,
 		       Uint32 * out_frag_page_id) 
 {

--- 1.4/storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp	2006-01-11 09:26:03 +01:00
+++ 1.5/storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp	2006-01-12 15:38:30 +01:00
@@ -89,7 +89,7 @@
 //
 // The full page range struct
 
-Uint32 Dbtup::getEmptyPage(Fragrecord* const regFragPtr)
+Uint32 Dbtup::getEmptyPage(Fragrecord* regFragPtr)
 {
   Uint32 pageId = regFragPtr->emptyPrimPage.firstItem;
   if (pageId == RNIL) {
@@ -108,7 +108,7 @@
   return pageId;
 }//Dbtup::getEmptyPage()
 
-Uint32 Dbtup::getRealpid(Fragrecord*  const regFragPtr, Uint32 logicalPageId) 
+Uint32 Dbtup::getRealpid(Fragrecord* regFragPtr, Uint32 logicalPageId) 
 {
   PageRangePtr grpPageRangePtr;
   Uint32 loopLimit;
@@ -241,7 +241,7 @@
 }//Dbtup::insertPageRangeTab()
 
 
-void Dbtup::releaseFragPages(Fragrecord* const regFragPtr) 
+void Dbtup::releaseFragPages(Fragrecord* regFragPtr) 
 {
   if (regFragPtr->rootPageRange == RNIL) {
     ljam();
@@ -349,7 +349,7 @@
   regFragPtr->nextStartRange = 0;
 }//initFragRange()
 
-Uint32 Dbtup::allocFragPages(Fragrecord* const regFragPtr, Uint32 tafpNoAllocRequested) 
+Uint32 Dbtup::allocFragPages(Fragrecord* regFragPtr, Uint32 tafpNoAllocRequested) 
 {
   Uint32 tafpPagesAllocated = 0;
   while (true) {

--- 1.26/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp	2006-01-11 09:26:03 +01:00
+++ 1.27/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp	2006-01-12 15:38:30 +01:00
@@ -28,7 +28,7 @@
 #define ljamEntry() { jamEntryLine(3000 + __LINE__); }
 
 void
-Dbtup::setUpQueryRoutines(Tablerec* const regTabPtr)
+Dbtup::setUpQueryRoutines(Tablerec *regTabPtr)
 {
   Uint32 startDescriptor= regTabPtr->tabDescriptor;
   ndbrequire((startDescriptor + (regTabPtr->m_no_of_attributes << ZAD_LOG_SIZE)) 

--- 1.18/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp	2006-01-11 23:49:47 +01:00
+++ 1.19/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp	2006-01-12 15:38:30 +01:00
@@ -356,8 +356,8 @@
 /* ---------------------------------------------------------------- */
 void
 Dbtup::checkImmediateTriggersAfterInsert(KeyReqStruct *req_struct,
-                                         Operationrec* const regOperPtr, 
-                                         Tablerec* const regTablePtr)
+                                         Operationrec *regOperPtr, 
+                                         Tablerec *regTablePtr)
 {
   if(refToBlock(req_struct->TC_ref) != DBTC) {
     return;
@@ -374,8 +374,8 @@
 
 void
 Dbtup::checkImmediateTriggersAfterUpdate(KeyReqStruct *req_struct,
-                                         Operationrec* const regOperPtr, 
-                                         Tablerec* const regTablePtr)
+                                         Operationrec* regOperPtr, 
+                                         Tablerec* regTablePtr)
 {
   if(refToBlock(req_struct->TC_ref) != DBTC) {
     return;
@@ -399,8 +399,8 @@
 
 void
 Dbtup::checkImmediateTriggersAfterDelete(KeyReqStruct *req_struct,
-                                         Operationrec* const regOperPtr, 
-                                         Tablerec* const regTablePtr)
+                                         Operationrec* regOperPtr, 
+                                         Tablerec* regTablePtr)
 {
   if(refToBlock(req_struct->TC_ref) != DBTC) {
     return;
@@ -444,8 +444,8 @@
 /*                                                                  */
 /* ---------------------------------------------------------------- */
 void Dbtup::checkDetachedTriggers(KeyReqStruct *req_struct,
-                                  Operationrec* const regOperPtr,
-                                  Tablerec* const regTablePtr)
+                                  Operationrec* regOperPtr,
+                                  Tablerec* regTablePtr)
 {
   Uint32 save_type = regOperPtr->op_struct.op_type;
   Tuple_header *save_ptr = req_struct->m_tuple_ptr;  
@@ -1049,9 +1049,9 @@
 
 int
 Dbtup::executeTuxInsertTriggers(Signal* signal,
-                                Operationrec* const regOperPtr,
-                                Fragrecord* const regFragPtr,
-                                Tablerec* const regTabPtr)
+                                Operationrec* regOperPtr,
+                                Fragrecord* regFragPtr,
+                                Tablerec* regTabPtr)
 {
   TuxMaintReq* const req = (TuxMaintReq*)signal->getDataPtrSend();
   // fill in constant part
@@ -1066,9 +1066,9 @@
 
 int
 Dbtup::executeTuxUpdateTriggers(Signal* signal,
-                                Operationrec* const regOperPtr,
-                                Fragrecord* const regFragPtr,
-                                Tablerec* const regTabPtr)
+                                Operationrec* regOperPtr,
+                                Fragrecord* regFragPtr,
+                                Tablerec* regTabPtr)
 {
   TuxMaintReq* const req = (TuxMaintReq*)signal->getDataPtrSend();
   // fill in constant part
@@ -1139,8 +1139,8 @@
 void
 Dbtup::executeTuxCommitTriggers(Signal* signal,
                                 Operationrec* regOperPtr,
-                                Fragrecord* const regFragPtr,
-                                Tablerec* const regTabPtr)
+                                Fragrecord* regFragPtr,
+                                Tablerec* regTabPtr)
 {
   TuxMaintReq* const req = (TuxMaintReq*)signal->getDataPtrSend();
   Uint32 tupVersion;
@@ -1174,8 +1174,8 @@
 void
 Dbtup::executeTuxAbortTriggers(Signal* signal,
                                Operationrec* regOperPtr,
-                               Fragrecord* const regFragPtr,
-                               Tablerec* const regTabPtr)
+                               Fragrecord* regFragPtr,
+                               Tablerec* regTabPtr)
 {
   TuxMaintReq* const req = (TuxMaintReq*)signal->getDataPtrSend();
   // get version
Thread
bk commit into 5.1 tree (knielsen:1.2045)knielsen12 Jan