Commit d7885b5e authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 

into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Auto merged
parents 599a7842 499ebf4d

ndb/include/kernel/signaldata/AttrInfo.hpp

+2 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ class AttrInfo { 
   */

  friend class Dbtc;

  friend class Dblqh;

  friend class NdbScanOperation;



  friend bool printATTRINFO(FILE *, const Uint32 *, Uint32, Uint16);

ndb/include/kernel/signaldata/KeyInfo.hpp

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ class KeyInfo { 
  friend class DbUtil;

  friend class NdbOperation;

  friend class NdbScanOperation;

  friend class NdbIndexScanOperation;



  /**

   * Reciver(s)

ndb/include/kernel/signaldata/ScanFrag.hpp

+4 −2
Original line number Diff line number Diff line
@@ -35,13 +35,15 @@ class ScanFragReq { 
public:

  STATIC_CONST( SignalLength = 12 );

  

  friend bool printSCAN_FRAGREQ(FILE *, const Uint32*, Uint32, Uint16);

  

public:

  Uint32 senderData;

  Uint32 resultRef;       // Where to send the result

  Uint32 savePointId;

  Uint32 requestInfo;

  Uint32 tableId;

  Uint32 fragmentNo;

  Uint32 fragmentNoKeyLen;

  Uint32 schemaVersion;

  Uint32 transId1;

  Uint32 transId2;

ndb/include/kernel/signaldata/ScanTab.hpp

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ private: 
   * DATA VARIABLES

   */

  UintR apiConnectPtr;        // DATA 0

  UintR attrLen;              // DATA 1

  UintR attrLenKeyLen;        // DATA 1

  UintR requestInfo;          // DATA 2

  UintR tableId;              // DATA 3

  UintR tableSchemaVersion;   // DATA 4

ndb/include/ndbapi/NdbConnection.hpp

+1 −0
Original line number Diff line number Diff line
@@ -673,6 +673,7 @@ private: 
  void printState();

#endif

  bool checkState_TransId(const Uint32 * transId) const;

  void define_scan_op(NdbIndexScanOperation*);

};



inline