bk commit into 5.1 tree (jonas:1.2088) BUG#10987

[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.2088 06/01/30 08:23:54 jonas@stripped +3 -0
  bug#10987 - ndb - ndb_rpl_bank
    more printouts...

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
    1.27 06/01/30 08:23:52 jonas@stripped +2 -1
    printouts

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.72 06/01/30 08:23:51 jonas@stripped +11 -9
    printouts

  storage/ndb/src/kernel/blocks/backup/Backup.cpp
    1.34 06/01/30 08:23:51 jonas@stripped +5 -0
    printouts

# 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/mysql-5.1-new

--- 1.33/storage/ndb/src/kernel/blocks/backup/Backup.cpp	2006-01-20 05:41:55 +01:00
+++ 1.34/storage/ndb/src/kernel/blocks/backup/Backup.cpp	2006-01-30 08:23:51 +01:00
@@ -2756,6 +2756,11 @@
   BackupRecordPtr ptr;
   c_backupPool.getPtr(ptr, senderData);
 
+  ndbout_c("execGET_TABINFOREF: tab: %d errorCode: %d extra: %d",
+	   ref->tableId,
+	   ref->errorCode,
+	   signal->theData[signal->getLength()-1]);
+  
   defineBackupRef(signal, ptr, ref->errorCode);
 }
 

--- 1.71/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-01-27 15:57:57 +01:00
+++ 1.72/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-01-30 08:23:51 +01:00
@@ -7114,7 +7114,7 @@
       return;
     }
     
-    sendGET_TABINFOREF(signal, req, GetTabInfoRef::Busy);
+    sendGET_TABINFOREF(signal, req, GetTabInfoRef::Busy, __LINE__);
     return;
   }
   
@@ -7135,7 +7135,7 @@
     if(len > MAX_TAB_NAME_SIZE){
       jam();
       releaseSections(signal);
-      sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNameTooLong);
+      sendGET_TABINFOREF(signal,req,GetTabInfoRef::TableNameTooLong, __LINE__);
       return;
     }
 
@@ -7147,7 +7147,7 @@
     if(!r0.getWords((Uint32*)tableName, (len+3)/4)){
       jam();
       releaseSections(signal);
-      sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined);
+      sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined, __LINE__);
       return;
     }
     releaseSections(signal);
@@ -7169,14 +7169,14 @@
   // The table seached for was not found
   if(objEntry == 0){
     jam();
-    sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined);
+    sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined, __LINE__);
     return;
   }//if
   
   if (objEntry->m_tableState != SchemaFile::TABLE_ADD_COMMITTED &&
       objEntry->m_tableState != SchemaFile::ALTER_TABLE_COMMITTED){
     jam();
-    sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined);
+    sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined, __LINE__);
     return;
   }//if
 
@@ -7189,7 +7189,7 @@
     if (tabPtr.p->tabState != TableRecord::DEFINED)
     {
       jam();
-      sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined);
+      sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined, __LINE__);
       return;
     }
   }
@@ -7280,7 +7280,8 @@
 
 void Dbdict::sendGET_TABINFOREF(Signal* signal, 
 				GetTabInfoReq * req,
-				GetTabInfoRef::ErrorCode errorCode) 
+				GetTabInfoRef::ErrorCode errorCode,
+				Uint32 line) 
 {
   jamEntry();
   GetTabInfoRef * const ref = (GetTabInfoRef *)&signal->theData[0];
@@ -7289,8 +7290,9 @@
    */
   BlockReference retRef = req->senderRef;
   ref->errorCode = errorCode;
-  
-  sendSignal(retRef, GSN_GET_TABINFOREF, signal, signal->length(), JBB);
+  signal->theData[GetTabInfoRef::SignalLength] = line;
+  sendSignal(retRef, GSN_GET_TABINFOREF, signal, 
+	     GetTabInfoRef::SignalLength+1, JBB);
 }//sendGET_TABINFOREF()
 
 void

--- 1.26/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp	2006-01-17 09:24:53 +01:00
+++ 1.27/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp	2006-01-30 08:23:52 +01:00
@@ -2135,7 +2135,8 @@
   /* ------------------------------------------------------------ */
   void sendGET_TABINFOREF(Signal* signal, 
 			  GetTabInfoReq*,
-			  GetTabInfoRef::ErrorCode errorCode);
+			  GetTabInfoRef::ErrorCode errorCode,
+			  Uint32 line);
 
   void sendGET_TABLEID_REF(Signal* signal, 
 			   GetTableIdReq * req,