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

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

ndb/include/kernel/Interpreter.hpp

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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 {

ndb/include/kernel/signaldata/ScanTab.hpp

@@ -252,7 +252,7 @@ public:
    * Length of signal
    */
   STATIC_CONST( SignalLength = 4 );
-  static const Uint32 EndOfData = (1 << 31);
+  STATIC_CONST( EndOfData = (1 << 31) );
   
 private:
 

ndb/include/kernel/signaldata/UpgradeStartup.hpp

@@ -7,10 +7,10 @@ struct UpgradeStartup {
 
   static void installEXEC(SimulatedBlock*);
 
-  static const Uint32 GSN_CM_APPCHG = 131;
-  static const Uint32 GSN_CNTR_MASTERCONF = 148;
-  static const Uint32 GSN_CNTR_MASTERREF = 149;
-  static const Uint32 GSN_CNTR_MASTERREQ = 150;
+  STATIC_CONST( GSN_CM_APPCHG = 131 );
+  STATIC_CONST( GSN_CNTR_MASTERCONF = 148 );
+  STATIC_CONST( GSN_CNTR_MASTERREF = 149 );
+  STATIC_CONST( GSN_CNTR_MASTERREQ = 150 );
 
   static void sendCmAppChg(Ndbcntr&, Signal *, Uint32 startLevel);
   static void execCM_APPCHG(SimulatedBlock& block, Signal*);

ndb/include/logger/FileLogHandler.hpp

@@ -37,11 +37,11 @@ class FileLogHandler : public LogHandler
 {
 public:
   /** Max number of log files to archive. */
-  static const int MAX_NO_FILES = 6;	
+  STATIC_CONST( MAX_NO_FILES = 6 );	
   /** Max file size of the log before archiving.  */
-  static const long MAX_FILE_SIZE = 1024000;
+  STATIC_CONST( MAX_FILE_SIZE = 1024000 );
   /** Max number of log entries before archiving. */
-  static const unsigned int MAX_LOG_ENTRIES = 10000;
+  STATIC_CONST( MAX_LOG_ENTRIES = 10000 );
 
   /**
    * Default constructor.

ndb/include/logger/LogHandler.hpp

@@ -157,11 +157,11 @@ public:
 
 protected:
   /** Max length of the date and time header in the log. */
-  static const int MAX_DATE_TIME_HEADER_LENGTH = 64;
+  STATIC_CONST( MAX_DATE_TIME_HEADER_LENGTH = 64 );
   /** Max length of the header the log. */
-  static const int MAX_HEADER_LENGTH = 128;
+  STATIC_CONST( MAX_HEADER_LENGTH = 128 );
   /** Max lenght of footer in the log. */
-  static const int MAX_FOOTER_LENGTH = 128;
+  STATIC_CONST( MAX_FOOTER_LENGTH = 128 );
 
   /**
    * Write the header to the log.

ndb/include/logger/Logger.hpp

@@ -279,7 +279,7 @@ private:
   Logger operator = (const Logger&);
   bool operator == (const Logger&);
 
-  static const int MAX_LOG_LEVELS = 8;
+  STATIC_CONST( MAX_LOG_LEVELS = 8 );
 
   bool m_logLevels[MAX_LOG_LEVELS];
   

ndb/include/ndb_global.h

@@ -63,7 +63,7 @@
 
 static const char table_name_separator =  '/';
 
-#ifdef NDB_VC98
+#if defined(_AIX) || defined(NDB_VC98)
 #define STATIC_CONST(x) enum { x }
 #else
 #define STATIC_CONST(x) static const Uint32 x

ndb/include/ndbapi/NdbBlob.hpp

@@ -192,7 +192,7 @@ public:
   /**
    * Get blob parts table name.  Useful only to test programs.
    */
-  static const unsigned BlobTableNameSize = 40;
+  STATIC_CONST( BlobTableNameSize = 40 );
   static int getBlobTableName(char* btname, Ndb* anNdb, const char* tableName, const char* columnName);
   /**
    * Return error object.  The error may be blob specific (below) or may
@@ -200,19 +200,19 @@ public:
    */
   const NdbError& getNdbError() const;
   // "Invalid blob attributes or invalid blob parts table"
-  static const int ErrTable = 4263;
+  STATIC_CONST( ErrTable = 4263 );
   // "Invalid usage of blob attribute" 
-  static const int ErrUsage = 4264;
+  STATIC_CONST( ErrUsage = 4264 );
   // "Method is not valid in current blob state"
-  static const int ErrState = 4265;
+  STATIC_CONST( ErrState = 4265 );
   // "Invalid blob seek position"
-  static const int ErrSeek = 4266;
+  STATIC_CONST( ErrSeek = 4266 );
   // "Corrupted blob value"
-  static const int ErrCorrupt = 4267;
+  STATIC_CONST( ErrCorrupt = 4267 );
   // "Error in blob head update forced rollback of transaction"
-  static const int ErrAbort = 4268;
+  STATIC_CONST( ErrAbort = 4268 );
   // "Unknown blob error"
-  static const int ErrUnknown = 4269;
+  STATIC_CONST( ErrUnknown = 4269 );
   /**
    * Return info about all blobs in this operation.
    */

ndb/include/util/Properties.hpp

@@ -52,7 +52,7 @@ private:
  */
 class Properties {
 public:
-  static const char delimiter = ':';
+  static const char delimiter;
   static const char version[];
 
   Properties(bool case_insensitive= false);

ndb/src/common/util/Properties.cpp

@@ -31,6 +31,7 @@ char * f_strdup(const char * s){
  * Note has to be a multiple of 4 bytes
  */
 const char Properties::version[] = { 2, 0, 0, 1, 1, 1, 1, 4 };
+const char Properties::delimiter = ':';
 
 /**
  * PropertyImpl

ndb/src/kernel/blocks/dbdict/Dbdict.hpp

@@ -1507,19 +1507,19 @@ private:
 
   // Common operation record pool
 public:
-  static const size_t opCreateTableSize = sizeof(CreateTableRecord);
-  static const size_t opDropTableSize = sizeof(DropTableRecord);
-  static const size_t opCreateIndexSize = sizeof(OpCreateIndex);
-  static const size_t opDropIndexSize = sizeof(OpDropIndex);
-  static const size_t opAlterIndexSize = sizeof(OpAlterIndex);
-  static const size_t opBuildIndexSize = sizeof(OpBuildIndex);
-  static const size_t opCreateEventSize = sizeof(OpCreateEvent);
-  static const size_t opSubEventSize = sizeof(OpSubEvent);
-  static const size_t opDropEventSize = sizeof(OpDropEvent);
-  static const size_t opSignalUtilSize = sizeof(OpSignalUtil);
-  static const size_t opCreateTriggerSize = sizeof(OpCreateTrigger);
-  static const size_t opDropTriggerSize = sizeof(OpDropTrigger);
-  static const size_t opAlterTriggerSize = sizeof(OpAlterTrigger);
+  STATIC_CONST( opCreateTableSize = sizeof(CreateTableRecord) );
+  STATIC_CONST( opDropTableSize = sizeof(DropTableRecord) );
+  STATIC_CONST( opCreateIndexSize = sizeof(OpCreateIndex) );
+  STATIC_CONST( opDropIndexSize = sizeof(OpDropIndex) );
+  STATIC_CONST( opAlterIndexSize = sizeof(OpAlterIndex) );
+  STATIC_CONST( opBuildIndexSize = sizeof(OpBuildIndex) );
+  STATIC_CONST( opCreateEventSize = sizeof(OpCreateEvent) );
+  STATIC_CONST( opSubEventSize = sizeof(OpSubEvent) );
+  STATIC_CONST( opDropEventSize = sizeof(OpDropEvent) );
+  STATIC_CONST( opSignalUtilSize = sizeof(OpSignalUtil) );
+  STATIC_CONST( opCreateTriggerSize = sizeof(OpCreateTrigger) );
+  STATIC_CONST( opDropTriggerSize = sizeof(OpDropTrigger) );
+  STATIC_CONST( opAlterTriggerSize = sizeof(OpAlterTrigger) );
 private:
 #define PTR_ALIGN(n) ((((n)+sizeof(void*)-1)>>2)&~((sizeof(void*)-1)>>2))
   union OpRecordUnion {

ndb/src/kernel/blocks/dbdih/Sysfile.hpp

@@ -63,7 +63,7 @@ public:
   /**
    * No of 32 bits words in the sysfile
    */
-  static const Uint32 SYSFILE_SIZE32 = _SYSFILE_SIZE32;
+  STATIC_CONST( SYSFILE_SIZE32 = _SYSFILE_SIZE32 );
   
   Uint32 systemRestartBits;
 
@@ -106,7 +106,7 @@ public:
     ,NS_NotDefined             = 8
     ,NS_Standby                = 9
   };
-  static const Uint32 NODE_STATUS_SIZE = NODE_ARRAY_SIZE(MAX_NDB_NODES, 4);
+  STATIC_CONST( NODE_STATUS_SIZE = NODE_ARRAY_SIZE(MAX_NDB_NODES, 4) );
   Uint32 nodeStatus[NODE_STATUS_SIZE];
 
   static Uint32 getNodeStatus(NodeId, const Uint32 nodeStatus[]);
@@ -116,8 +116,8 @@ public:
    * The node group of each node
    *   Sizeof(NodeGroup) = 8 Bit
    */
-  static const Uint32 NODE_GROUPS_SIZE = NODE_ARRAY_SIZE(MAX_NDB_NODES, 
-							 NODEID_BITS);
+  STATIC_CONST( NODE_GROUPS_SIZE = NODE_ARRAY_SIZE(MAX_NDB_NODES, 
+							 NODEID_BITS) );
   Uint32 nodeGroups[NODE_GROUPS_SIZE];
   
   static Uint16 getNodeGroup(NodeId, const Uint32 nodeGroups[]);
@@ -126,8 +126,8 @@ public:
   /**
    * Any node can take over for any node
    */
-  static const Uint32 TAKE_OVER_SIZE = NODE_ARRAY_SIZE(MAX_NDB_NODES, 
-						       NODEID_BITS);
+  STATIC_CONST( TAKE_OVER_SIZE = NODE_ARRAY_SIZE(MAX_NDB_NODES, 
+						 NODEID_BITS) );
   Uint32 takeOver[TAKE_OVER_SIZE];
 
   static NodeId getTakeOverNode(NodeId, const Uint32 takeOver[]);

ndb/src/kernel/blocks/dbtux/Dbtux.hpp

@@ -107,16 +107,16 @@ public:
 
 private:
   // sizes are in words (Uint32)
-  static const unsigned MaxIndexFragments = 2 * MAX_FRAG_PER_NODE;
-  static const unsigned MaxIndexAttributes = MAX_ATTRIBUTES_IN_INDEX;
-  static const unsigned MaxAttrDataSize = 2048;
+  STATIC_CONST( MaxIndexFragments = 2 * MAX_FRAG_PER_NODE );
+  STATIC_CONST( MaxIndexAttributes = MAX_ATTRIBUTES_IN_INDEX );
+  STATIC_CONST( MaxAttrDataSize = 2048 );
 public:
-  static const unsigned DescPageSize = 256;
+  STATIC_CONST( DescPageSize = 256 );
 private:
-  static const unsigned MaxTreeNodeSize = MAX_TTREE_NODE_SIZE;
-  static const unsigned MaxPrefSize = MAX_TTREE_PREF_SIZE;
-  static const unsigned ScanBoundSegmentSize = 7;
-  static const unsigned MaxAccLockOps = MAX_PARALLEL_OP_PER_SCAN;
+  STATIC_CONST( MaxTreeNodeSize = MAX_TTREE_NODE_SIZE );
+  STATIC_CONST( MaxPrefSize = MAX_TTREE_PREF_SIZE );
+  STATIC_CONST( ScanBoundSegmentSize = 7 );
+  STATIC_CONST( MaxAccLockOps = MAX_PARALLEL_OP_PER_SCAN );
   BLOCK_DEFINES(Dbtux);
 
   // forward declarations
@@ -159,13 +159,13 @@ private:
   };
 
   // AttributeHeader size is assumed to be 1 word
-  static const unsigned AttributeHeaderSize = 1;
+  STATIC_CONST( AttributeHeaderSize = 1 );
 
   /*
    * Logical tuple address, "local key".  Identifies table tuples.
    */
   typedef Uint32 TupAddr;
-  static const unsigned NullTupAddr = (Uint32)-1;
+  STATIC_CONST( NullTupAddr = (Uint32)-1 );
 
   /*
    * Physical tuple address in TUP.  Provides fast access to table tuple
@@ -216,7 +216,7 @@ private:
     bool eq(const TreeEnt ent) const;
     int cmp(const TreeEnt ent) const;
   };
-  static const unsigned TreeEntSize = sizeof(TreeEnt) >> 2;
+  STATIC_CONST( TreeEntSize = sizeof(TreeEnt) >> 2 );
   static const TreeEnt NullTreeEnt;
 
   /*
@@ -246,7 +246,7 @@ private:
     Uint32 m_nodeScan;          // list of scans at this node
     TreeNode();
   };
-  static const unsigned NodeHeadSize = sizeof(TreeNode) >> 2;
+  STATIC_CONST( NodeHeadSize = sizeof(TreeNode) >> 2 );
 
   /*
    * Tree node "access size" was for an early version with signal
@@ -323,7 +323,7 @@ private:
     unsigned m_indexId : 24;
     unsigned pad1 : 8;
   };
-  static const unsigned DescHeadSize = sizeof(DescHead) >> 2;
+  STATIC_CONST( DescHeadSize = sizeof(DescHead) >> 2 );
 
   /*
    * Attribute metadata.  Size must be multiple of word size.
@@ -337,7 +337,7 @@ private:
     unsigned m_typeId : 6;
     unsigned m_charset : 10;
   };
-  static const unsigned DescAttrSize = sizeof(DescAttr) >> 2;
+  STATIC_CONST( DescAttrSize = sizeof(DescAttr) >> 2 );
 
   /*
    * Complete metadata for one index. The array of attributes has
@@ -694,8 +694,8 @@ private:
     DebugTree = 4,              // log and check tree after each op
     DebugScan = 8               // log scans
   };
-  static const int DataFillByte = 0xa2;
-  static const int NodeFillByte = 0xa4;
+  STATIC_CONST( DataFillByte = 0xa2 );
+  STATIC_CONST( NodeFillByte = 0xa4 );
 #endif
 
   // start up info

ndb/src/kernel/vm/LongSignal.hpp

@@ -25,7 +25,7 @@
  */
 struct SectionSegment {
 
-  static const Uint32 DataLength = 60;
+  STATIC_CONST( DataLength = 60 );
   
   Uint32 m_ownerRef;
   Uint32 m_sz;

ndb/src/mgmsrv/ConfigInfo.hpp

@@ -27,7 +27,7 @@
  * A MANDATORY parameters must be specified in the config file
  * An UNDEFINED parameter may or may not be specified in the config file
  */
-static const char* MANDATORY = (char*)~(UintPtr)0;     // Default value for mandatory params.
+static const char* MANDATORY = (char*)~(UintPtr)0;// Default value for mandatory params.
 static const char* UNDEFINED = 0;                 // Default value for undefined params.
 
 /**

ndb/src/mgmsrv/MgmtSrvr.hpp

@@ -676,7 +676,7 @@ private:
   //**************************************************************************
   // General signal handling data
 
-  static const unsigned int WAIT_FOR_RESPONSE_TIMEOUT = 300000; // Milliseconds
+  STATIC_CONST( WAIT_FOR_RESPONSE_TIMEOUT = 300000 ); // Milliseconds
   // Max time to wait for a signal to arrive
 
   NdbApiSignal* theSignalIdleList;

ndb/src/ndbapi/ObjectMap.hpp

@@ -29,7 +29,7 @@
 class NdbObjectIdMap //: NdbLockable
 {
 public:
-  static const Uint32 InvalidId = ~0;
+  STATIC_CONST( InvalidId = ~0 );
   NdbObjectIdMap(Uint32 initalSize = 128, Uint32 expandSize = 10);
   ~NdbObjectIdMap();
 

ndb/src/ndbapi/TransporterFacade.hpp

@@ -174,13 +174,13 @@ private:
    * Block number handling
    */
 public:
-  static const unsigned MAX_NO_THREADS = 4711;
+  STATIC_CONST( MAX_NO_THREADS = 4711 );
 private:
 
   struct ThreadData {
-    static const Uint32 ACTIVE = (1 << 16) | 1;
-    static const Uint32 INACTIVE = (1 << 16);
-    static const Uint32 END_OF_LIST = MAX_NO_THREADS + 1;
+    STATIC_CONST( ACTIVE = (1 << 16) | 1 );
+    STATIC_CONST( INACTIVE = (1 << 16) );
+    STATIC_CONST( END_OF_LIST = MAX_NO_THREADS + 1 );
     
     ThreadData(Uint32 initialSize = 32);