bk commit into 5.1 tree (joreland:1.1945)

[jonas.oreland]

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.1945 05/07/22 08:57:51 joreland@stripped +6 -0
  merge

  storage/ndb/src/ndbapi/NdbBlob.cpp
    1.26 05/07/22 08:57:46 joreland@stripped +1 -1
    merge

  storage/ndb/src/kernel/blocks/diskpage.cpp
    1.4 05/07/22 08:57:46 joreland@stripped +2 -1
    merge

  storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
    1.22 05/07/22 08:57:46 joreland@stripped +3 -1
    merge

  storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
    1.42 05/07/22 08:57:46 joreland@stripped +2 -2
    merge

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
    1.73 05/07/22 08:57:46 joreland@stripped +4 -1
    merge

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.88 05/07/22 08:57:46 joreland@stripped +2 -2
    merge

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

--- 1.3/storage/ndb/src/kernel/blocks/diskpage.cpp	2005-04-30 13:42:58 +02:00
+++ 1.4/storage/ndb/src/kernel/blocks/diskpage.cpp	2005-07-22 08:57:46 +02:00
@@ -32,9 +32,10 @@
 NdbOut&
 operator<<(NdbOut& out, const File_formats::Zero_page_header& obj)
 {
+  char buf[256];
   out << "page size:   " << obj.m_page_size << endl;
   out << "ndb version: " << obj.m_ndb_version << ", " <<
-    getVersionString(obj.m_ndb_version, 0) << endl;
+    getVersionString(obj.m_ndb_version, 0, buf, sizeof(buf)) << endl;
   out << "ndb node id: " << obj.m_node_id << endl;
   out << "file type:   " << obj.m_file_type << endl;
   out << "time:        " << obj.m_time << ", " 

--- 1.87/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2005-07-21 16:15:15 +02:00
+++ 1.88/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2005-07-22 08:57:46 +02:00
@@ -4283,7 +4283,7 @@
     c_obj_hash.remove(obj_ptr);
     {
       Rope org(c_rope_pool, origTablePtr.p->tableName);
-      org.copy(alterTabPtr->previousTableName);
+      org.copy(alterTabPtrP->previousTableName);
       
       ConstRope src(c_rope_pool, newTablePtr.p->tableName);
       char tmp[MAX_TAB_NAME_SIZE];
@@ -4322,7 +4322,7 @@
     {
       // Restore name
       Rope org(c_rope_pool, tablePtr.p->tableName);
-      ndbrequire(org.assign(alterTabPtr->previousTableName));
+      ndbrequire(org.assign(alterTabPtrP->previousTableName));
       
       // Revert schema version
       tablePtr.p->tableVersion = tablePtr.p->tableVersion - 1;

--- 1.72/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2005-07-21 16:15:16 +02:00
+++ 1.73/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2005-07-22 08:57:46 +02:00
@@ -1944,6 +1944,7 @@
                        KeyReqStruct *req_struct,
                        Operationrec * const regOperPtr,
                        TupTriggerData* const trigPtr,
+		       Uint32 fragmentId,
                        Uint32 noPrimKeySignals, 
                        Uint32 noBeforeSignals, 
                        Uint32 noAfterSignals);
@@ -2460,7 +2461,6 @@
 				   Uint32 i, Uint32 sz);
   void disk_page_update_free_space(Fragrecord*, PagePtr, Uint32 i);
   
-  void disk_page_unmap_callback(Signal*, Uint32 tableId, Uint32 page_id);
   void disk_page_commit_callback(Signal*, Uint32 opPtrI, Uint32 page_id);  
   
   void disk_page_log_buffer_callback(Signal*, Uint32 opPtrI, Uint32); 
@@ -2481,6 +2481,9 @@
    * Disk restart code
    */
 public:
+  int disk_page_load_hook(Uint32 page_id);
+  void disk_page_unmap_callback(Uint32 page_id);
+  
   void disk_restart_alloc_extent(Uint32 tableId, Uint32 fragId, 
 				 const Local_key* key);
   void disk_restart_page_bits(Uint32 tableId, Uint32 fragId,

--- 1.41/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp	2005-07-21 16:15:16 +02:00
+++ 1.42/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp	2005-07-22 08:57:46 +02:00
@@ -1131,7 +1131,7 @@
     signal->theData[0] = operPtr.p->userpointer;
     signal->theData[1] = attrId;
     
-    EXECUTE_DIRECT(DBLQH, GSN_READ_PSUEDO_REQ, signal, 2);
+    EXECUTE_DIRECT(DBLQH, GSN_READ_PSEUDO_REQ, signal, 2);
     outBuffer[0] = signal->theData[0];
     outBuffer[1] = signal->theData[1];
     return 2;
@@ -1139,7 +1139,7 @@
     signal->theData[0] = operPtr.p->userpointer;
     signal->theData[1] = attrId;
     
-    EXECUTE_DIRECT(DBLQH, GSN_READ_PSUEDO_REQ, signal, 2);
+    EXECUTE_DIRECT(DBLQH, GSN_READ_PSEUDO_REQ, signal, 2);
     outBuffer[0] = signal->theData[0];
     return 1;
   case AttributeHeader::DISK_REF:

--- 1.21/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp	2005-07-21 15:33:45 +02:00
+++ 1.22/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp	2005-07-22 08:57:46 +02:00
@@ -725,6 +725,7 @@
                   req_struct,
                   regOperPtr,
                   trigPtr,
+		  regFragPtr.p->fragmentId,
                   noPrimKey,
                   noBeforeWords,
                   noAfterWords);
@@ -928,6 +929,7 @@
                             KeyReqStruct *req_struct,
                             Operationrec * const regOperPtr, 
                             TupTriggerData* const trigPtr, 
+			    Uint32 fragmentId,
                             Uint32 noPrimKeyWords, 
                             Uint32 noBeforeValueWords, 
                             Uint32 noAfterValueWords)
@@ -936,7 +938,7 @@
   
   fireTrigOrd->setConnectionPtr(req_struct->TC_index);
   fireTrigOrd->setTriggerId(trigPtr->triggerId);
-  fireTrigOrd->fragId= regOperPtr->fragId >> 1; //Handle two local frags
+  fireTrigOrd->fragId= fragmentId;
 
   switch(regOperPtr->op_struct.op_type) {
   case(ZINSERT):

--- 1.25/storage/ndb/src/ndbapi/NdbBlob.cpp	2005-07-21 15:33:45 +02:00
+++ 1.26/storage/ndb/src/ndbapi/NdbBlob.cpp	2005-07-22 08:57:46 +02:00
@@ -77,7 +77,7 @@
     but may change the fragment type if it is UserDefined since it
     must be hash based so that the kernel can handle it on its own.
   */
-  bt.m_primaryTableId = t->m_tableId;
+  bt.m_primaryTableId = t->m_id;
   bt.m_ng.clear();
   switch (t->getFragmentType())
   {