bk commit into 5.1 tree (jonas:1.2128)

[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.2128 06/02/02 07:22:20 jonas@stripped +1 -0
  Merge joreland@stripped:/home/bk/mysql-5.1-new
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.75 06/02/02 07:22:16 jonas@stripped +0 -0
    Auto merged

# 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/RESYNC

--- 1.74/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-01-31 23:22:30 +01:00
+++ 1.75/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-02-02 07:22:16 +01:00
@@ -7123,7 +7123,7 @@
       return;
     }
     
-    sendGET_TABINFOREF(signal, req, GetTabInfoRef::Busy, __LINE__);
+    sendGET_TABINFOREF(signal, req, GetTabInfoRef::Busy);
     return;
   }
   
@@ -7144,7 +7144,7 @@
     if(len > MAX_TAB_NAME_SIZE){
       jam();
       releaseSections(signal);
-      sendGET_TABINFOREF(signal,req,GetTabInfoRef::TableNameTooLong, __LINE__);
+      sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNameTooLong);
       return;
     }
 
@@ -7156,7 +7156,7 @@
     if(!r0.getWords((Uint32*)tableName, (len+3)/4)){
       jam();
       releaseSections(signal);
-      sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined, __LINE__);
+      sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined);
       return;
     }
     releaseSections(signal);
@@ -7178,14 +7178,14 @@
   // The table seached for was not found
   if(objEntry == 0){
     jam();
-    sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined, __LINE__);
+    sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined);
     return;
   }//if
   
   if (objEntry->m_tableState != SchemaFile::TABLE_ADD_COMMITTED &&
       objEntry->m_tableState != SchemaFile::ALTER_TABLE_COMMITTED){
     jam();
-    sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined, __LINE__);
+    sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined);
     return;
   }//if
 
@@ -7199,7 +7199,7 @@
 	tabPtr.p->tabState != TableRecord::BACKUP_ONGOING)
     {
       jam();
-      sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined, __LINE__);
+      sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined);
       return;
     }
   }
@@ -7290,8 +7290,7 @@
 
 void Dbdict::sendGET_TABINFOREF(Signal* signal, 
 				GetTabInfoReq * req,
-				GetTabInfoRef::ErrorCode errorCode,
-				Uint32 line) 
+				GetTabInfoRef::ErrorCode errorCode) 
 {
   jamEntry();
   GetTabInfoRef * const ref = (GetTabInfoRef *)&signal->theData[0];
@@ -7300,9 +7299,8 @@
    */
   BlockReference retRef = req->senderRef;
   ref->errorCode = errorCode;
-  signal->theData[GetTabInfoRef::SignalLength] = line;
-  sendSignal(retRef, GSN_GET_TABINFOREF, signal, 
-	     GetTabInfoRef::SignalLength+1, JBB);
+  
+  sendSignal(retRef, GSN_GET_TABINFOREF, signal, signal->length(), JBB);
 }//sendGET_TABINFOREF()
 
 void