Commit 3e68b087 authored by unknown's avatar unknown
Browse files

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
parents e948154c b5039930

ndb/include/kernel/Interpreter.hpp

+25 −25
Original line number Diff line number Diff line
@@ -45,31 +45,31 @@ public: 
  /**

   * Instructions

   */

  static const Uint32 READ_ATTR_INTO_REG    = 1;

  static const Uint32 WRITE_ATTR_FROM_REG   = 2;

  static const Uint32 LOAD_CONST_NULL       = 3;

  static const Uint32 LOAD_CONST16          = 4;

  static const Uint32 LOAD_CONST32          = 5;

  static const Uint32 LOAD_CONST64          = 6;

  static const Uint32 ADD_REG_REG           = 7;

  static const Uint32 SUB_REG_REG           = 8;

  static const Uint32 BRANCH                = 9;

  static const Uint32 BRANCH_REG_EQ_NULL    = 10;

  static const Uint32 BRANCH_REG_NE_NULL    = 11;

  static const Uint32 BRANCH_EQ_REG_REG     = 12;

  static const Uint32 BRANCH_NE_REG_REG     = 13;

  static const Uint32 BRANCH_LT_REG_REG     = 14;

  static const Uint32 BRANCH_LE_REG_REG     = 15;

  static const Uint32 BRANCH_GT_REG_REG     = 16;

  static const Uint32 BRANCH_GE_REG_REG     = 17;

  static const Uint32 EXIT_OK               = 18;

  static const Uint32 EXIT_REFUSE           = 19;

  static const Uint32 CALL                  = 20;

  static const Uint32 RETURN                = 21;

  static const Uint32 EXIT_OK_LAST          = 22;

  static const Uint32 BRANCH_ATTR_OP_ARG    = 23;

  static const Uint32 BRANCH_ATTR_EQ_NULL   = 24;

  static const Uint32 BRANCH_ATTR_NE_NULL   = 25;

  STATIC_CONST( READ_ATTR_INTO_REG    = 1 );

  STATIC_CONST( WRITE_ATTR_FROM_REG   = 2 );

  STATIC_CONST( LOAD_CONST_NULL       = 3 );

  STATIC_CONST( LOAD_CONST16          = 4 );

  STATIC_CONST( LOAD_CONST32          = 5 );

  STATIC_CONST( LOAD_CONST64          = 6 );

  STATIC_CONST( ADD_REG_REG           = 7 );

  STATIC_CONST( SUB_REG_REG           = 8 );

  STATIC_CONST( BRANCH                = 9 );

  STATIC_CONST( BRANCH_REG_EQ_NULL    = 10 );

  STATIC_CONST( BRANCH_REG_NE_NULL    = 11 );

  STATIC_CONST( BRANCH_EQ_REG_REG     = 12 );

  STATIC_CONST( BRANCH_NE_REG_REG     = 13 );

  STATIC_CONST( BRANCH_LT_REG_REG     = 14 );

  STATIC_CONST( BRANCH_LE_REG_REG     = 15 );

  STATIC_CONST( BRANCH_GT_REG_REG     = 16 );

  STATIC_CONST( BRANCH_GE_REG_REG     = 17 );

  STATIC_CONST( EXIT_OK               = 18 );

  STATIC_CONST( EXIT_REFUSE           = 19 );

  STATIC_CONST( CALL                  = 20 );

  STATIC_CONST( RETURN                = 21 );

  STATIC_CONST( EXIT_OK_LAST          = 22 );

  STATIC_CONST( BRANCH_ATTR_OP_ARG    = 23 );

  STATIC_CONST( BRANCH_ATTR_EQ_NULL   = 24 );

  STATIC_CONST( BRANCH_ATTR_NE_NULL   = 25 );

  

  /**

   * Macros for creating code

ndb/include/kernel/LogLevel.hpp

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ public: 
   * No of categories

   */

#define _LOGLEVEL_CATEGORIES (CFG_MAX_LOGLEVEL - CFG_MIN_LOGLEVEL + 1)

  static const Uint32 LOGLEVEL_CATEGORIES = _LOGLEVEL_CATEGORIES;

  STATIC_CONST( LOGLEVEL_CATEGORIES = _LOGLEVEL_CATEGORIES );

  

  void clear();

ndb/include/kernel/NodeState.hpp

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ public: 
  /**

   * Length in 32-bit words

   */

  static const Uint32 DataLength = 8 + NdbNodeBitmask::Size;

  STATIC_CONST( DataLength = 8 + NdbNodeBitmask::Size );

  

  /**

   * Constructor(s)

ndb/include/kernel/signaldata/DictSchemaInfo.hpp

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ class DictSchemaInfo { 
  friend class Dbdict;

  

public:

  static const unsigned HeaderLength = 3;

  static const unsigned DataLength = 22;

  STATIC_CONST( HeaderLength = 3 );

  STATIC_CONST( DataLength = 22 );

  

private:  

  Uint32 senderRef;

ndb/include/kernel/signaldata/DictTabInfo.hpp

+17 −17
Original line number Diff line number Diff line
@@ -221,33 +221,33 @@ public: 
  };

  

  // ScanOptimised constants

  static const unsigned updateOptimised = 0;

  static const unsigned scanOptimised = 1;

  STATIC_CONST( updateOptimised = 0 );

  STATIC_CONST( scanOptimised = 1 );

  

  // AttributeType constants

  static const unsigned SignedType = 0;

  static const unsigned UnSignedType = 1;

  static const unsigned FloatingPointType = 2;

  static const unsigned StringType = 3;

  STATIC_CONST( SignedType = 0 );

  STATIC_CONST( UnSignedType = 1 );

  STATIC_CONST( FloatingPointType = 2 );

  STATIC_CONST( StringType = 3 );

  

  // AttributeSize constants

  static const unsigned an8Bit = 3;

  static const unsigned a16Bit = 4;

  static const unsigned a32Bit = 5;

  static const unsigned a64Bit = 6;

  static const unsigned a128Bit = 7;

  STATIC_CONST( an8Bit = 3 );

  STATIC_CONST( a16Bit = 4 );

  STATIC_CONST( a32Bit = 5 );

  STATIC_CONST( a64Bit = 6 );

  STATIC_CONST( a128Bit = 7 );

  

  // AttributeDGroup constants

  static const unsigned NotDGroup = 0;

  static const unsigned DGroup = 1;

  STATIC_CONST( NotDGroup = 0 );

  STATIC_CONST( DGroup = 1 );

  

  // AttributeDKey constants

  static const unsigned NotDKey = 0;

  static const unsigned DKey = 1;

  STATIC_CONST( NotDKey = 0 );

  STATIC_CONST( DKey = 1 );

  

  // AttributeStoredInd constants

  static const unsigned NotStored = 0;

  static const unsigned Stored = 1;

  STATIC_CONST( NotStored = 0 );

  STATIC_CONST( Stored = 1 );

 

  // Table data interpretation

  struct Table {