Remove the remains of SCAN_TABINFO signal

ndb/include/kernel/GlobalSignalNumbers.h:
  Remove unused signal number for GSN_SCAN_TABINFO
ndb/include/kernel/signaldata/ScanTab.hpp:
  Remove definition of old signal ScanTabInfo
ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Removed old print function for SCAN_TABINFO
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Removed name for GSN_SCAN_TABINFO
ndb/src/ndbapi/NdbApiSignal.cpp:
  Removed SCAN_TABINFO and old comment
ndb/src/ndbapi/NdbConnectionScan.cpp:
  Removed duplicate definition of WAIFOR_SCAN_TIMEOUT, real one is in NdbScanOperation.cpp
ndb/src/ndbapi/NdbScanOperation.cpp:
  Removed duplicate debug printout
ndb/src/ndbapi/Ndbif.cpp:
  Removed SCAN_TABINFO

8 files changed, 1 insertions, 126 deletions

diff --git a/ndb/include/kernel/GlobalSignalNumbers.h b/ndb/include/kernel/GlobalSignalNumbers.h
index 7b70f4c3ac0..a16860561b5 100644
--- a/ndb/include/kernel/GlobalSignalNumbers.h
+++ b/ndb/include/kernel/GlobalSignalNumbers.h
@@ -84,7 +84,7 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES;
 
 #define GSN_SCAN_NEXTREQ                28
 #define GSN_SCAN_TABCONF                29
-#define GSN_SCAN_TABINFO                30
+// 30 unused
 #define GSN_SCAN_TABREF                 31
 #define GSN_SCAN_TABREQ                 32
 #define GSN_KEYINFO20                   33
diff --git a/ndb/include/kernel/signaldata/ScanTab.hpp b/ndb/include/kernel/signaldata/ScanTab.hpp
index 1c11bdee4ae..ab2978e48da 100644
--- a/ndb/include/kernel/signaldata/ScanTab.hpp
+++ b/ndb/include/kernel/signaldata/ScanTab.hpp
@@ -271,76 +271,6 @@ private:
 #define STATUS_SHIFT     (8)
 #define STATUS_MASK      (0xFF)
 
-/**
- * 
- * SENDER:  Dbtc, API
- * RECIVER: API, Dbtc
- */
-class ScanTabInfo {
-  /**
-   * Reciver(s) and Sender(s)
-   */
-  friend class NdbConnection; 
-  friend class Dbtc;  
-
-  /**
-   * For printing
-   */
-  friend bool printSCANTABINFO(FILE * output, const Uint32 * theData, Uint32 len, Uint16 receiverBlockNo);
-
-public:
-  /**
-   * Length of signal
-   */
-  STATIC_CONST( SignalLength = 17 );
-
-private:
-
-  // Type definitions
-
-  /**
-   * DATA VARIABLES
-   */
-  UintR apiConnectPtr;        // DATA 0
-  UintR operLenAndIdx[16];    // DATA 1-16
-  
-  /**
-   * Get:ers for operLenAndIdx
-   */
-  static Uint32 getLen(const UintR & operLenAndIdx);
-  static Uint8 getIdx(const UintR & operLenAndIdx);
-
-};
-
-
-/**
- * Operation length and index
- *
- l = Length of operation         - 24  Bits -> Max 16777215 (Bit 0-24)
- i = Index of operation          - 7  Bits -> Max 255 (Bit 25-32) 
-
-           1111111111222222222233
- 01234567890123456789012345678901
- llllllllllllllllllllllllliiiiiii
-*/
-
-#define LENGTH_SHIFT     (0)
-#define LENGTH_MASK      (0xFFFFFF)
-
-#define INDEX_SHIFT     (24)
-#define INDEX_MASK      (0xFF)
-
-inline
-Uint32
-ScanTabInfo::getLen(const UintR & operLenAndIdx){
-  return (Uint32)((operLenAndIdx >> LENGTH_SHIFT) & LENGTH_MASK);
-}
-
-inline
-Uint8
-ScanTabInfo::getIdx(const UintR & operLenAndIdx){
-  return (Uint8)((operLenAndIdx >> INDEX_SHIFT) & INDEX_MASK);
-}
 
 /**
  * 
diff --git a/ndb/src/common/debugger/signaldata/ScanTab.cpp b/ndb/src/common/debugger/signaldata/ScanTab.cpp
index eabb53d1a49..4b057171963 100644
--- a/ndb/src/common/debugger/signaldata/ScanTab.cpp
+++ b/ndb/src/common/debugger/signaldata/ScanTab.cpp
@@ -100,25 +100,6 @@ printSCANTABCONF(FILE * output, const Uint32 * theData, Uint32 len, Uint16 recei
 }
 
 bool
-printSCANTABINFO(FILE * output, const Uint32 * theData, Uint32 len, Uint16 receiverBlockNo){
-  
-  const ScanTabInfo * const sig = (ScanTabInfo *) theData;
-  
-  fprintf(output, " apiConnectPtr: H\'%.8x\n", 
-	  sig->apiConnectPtr);
-
-  fprintf(output, " Operation(s):\n");
-  for(int i = 0; i<16; i++){
-    fprintf(output, " [%.2u]ix=%d l=%.2d,", 
-	    i, sig->getIdx(sig->operLenAndIdx[i]), sig->getLen(sig->operLenAndIdx[i]));
-    if (((i+1) % 4) == 0)
-      fprintf(output, "\n");
-  }
-
-  return false;
-}
-
-bool
 printSCANTABREF(FILE * output, const Uint32 * theData, Uint32 len, Uint16 receiverBlockNo){
   
   const ScanTabRef * const sig = (ScanTabRef *) theData;
diff --git a/ndb/src/common/debugger/signaldata/SignalNames.cpp b/ndb/src/common/debugger/signaldata/SignalNames.cpp
index 377a588dbb0..bb492fa0411 100644
--- a/ndb/src/common/debugger/signaldata/SignalNames.cpp
+++ b/ndb/src/common/debugger/signaldata/SignalNames.cpp
@@ -32,7 +32,6 @@ const GsnName SignalNames [] = {
   ,{ GSN_READCONF,               "READCONF" }
   ,{ GSN_SCAN_NEXTREQ,           "SCAN_NEXTREQ" }
   ,{ GSN_SCAN_TABCONF,           "SCAN_TABCONF" }
-  ,{ GSN_SCAN_TABINFO,           "SCAN_TABINFO" }
   ,{ GSN_SCAN_TABREF,            "SCAN_TABREF" }
   ,{ GSN_SCAN_TABREQ,            "SCAN_TABREQ" }
   ,{ GSN_TC_COMMITCONF,          "TC_COMMITCONF" }
diff --git a/ndb/src/ndbapi/NdbApiSignal.cpp b/ndb/src/ndbapi/NdbApiSignal.cpp
index 4dc9bfb6fce..6f5e1e50d2c 100644
--- a/ndb/src/ndbapi/NdbApiSignal.cpp
+++ b/ndb/src/ndbapi/NdbApiSignal.cpp
@@ -15,18 +15,6 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-/******************************************************************************
-Name:          NdbApiSignal.C
-Include:
-Link:
-Author:        UABMNST Mona Natterkvist UAB/B/SD                         
-Date:          970829
-Version:       0.1
-Description:   Interface between TIS and NDB
-Documentation:
-Adjust:  971114  UABMNST   First version.
-         000705  QABANAB   Update of Protocol2
-******************************************************************************/
 #include "API.hpp"
 #include "NdbApiSignal.hpp"
 
@@ -193,15 +181,6 @@ NdbApiSignal::setSignal(int aNdbSignalType)
     }
     break;
 
-    case GSN_SCAN_TABINFO:
-    {
-      theTrace                = TestOrd::TraceAPI;
-      theReceiversBlockNumber = DBTC;
-      theVerId_signalNumber   = GSN_SCAN_TABINFO;
-      theLength               = 17;
-    }
-    break;
-
     case GSN_SCAN_NEXTREQ:
     {
       theTrace                = TestOrd::TraceAPI;
diff --git a/ndb/src/ndbapi/NdbConnectionScan.cpp b/ndb/src/ndbapi/NdbConnectionScan.cpp
index 1684a0e44bd..0c4490015ff 100644
--- a/ndb/src/ndbapi/NdbConnectionScan.cpp
+++ b/ndb/src/ndbapi/NdbConnectionScan.cpp
@@ -43,11 +43,6 @@
 
 #include <NdbOut.hpp>
 
-// time out for next scan result (-1 is infinite)
-// XXX should change default only if non-trivial interpreted program is used
-#define WAITFOR_SCAN_TIMEOUT    120000
-
-
 
 /***************************************************************************
  * int  receiveSCAN_TABREF(NdbApiSignal* aSignal)
diff --git a/ndb/src/ndbapi/NdbScanOperation.cpp b/ndb/src/ndbapi/NdbScanOperation.cpp
index a880f308d24..603ae85ad65 100644
--- a/ndb/src/ndbapi/NdbScanOperation.cpp
+++ b/ndb/src/ndbapi/NdbScanOperation.cpp
@@ -470,11 +470,6 @@ int NdbScanOperation::nextResult(bool fetchAllowed)
   if(DEBUG_NEXT_RESULT)
     ndbout_c("nextResult(%d) idx=%d last=%d", fetchAllowed, idx, last);
   
-  if(DEBUG_NEXT_RESULT) 
-    ndbout_c("nextResult(%d) idx=%d last=%d",
-	     fetchAllowed, 
-	     idx, last);
-
   /**
    * Check next buckets
    */
diff --git a/ndb/src/ndbapi/Ndbif.cpp b/ndb/src/ndbapi/Ndbif.cpp
index f561a641961..641eccaa59c 100644
--- a/ndb/src/ndbapi/Ndbif.cpp
+++ b/ndb/src/ndbapi/Ndbif.cpp
@@ -728,10 +728,6 @@ Ndb::handleReceivedSignal(NdbApiSignal* aSignal, LinearSectionPtr ptr[3])
       }
       goto InvalidSignal;
     }
-  case GSN_SCAN_TABINFO: 
-    {
-      goto InvalidSignal;
-    }
   case GSN_KEYINFO20: {
     tFirstDataPtr = int2void(tFirstData);
     if (tFirstDataPtr == 0) goto InvalidSignal;