merging

mysql-test/r/ps.result:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

16 files changed, 130 insertions, 87 deletions

diff --git a/ndb/include/kernel/signaldata/AlterIndx.hpp b/ndb/include/kernel/signaldata/AlterIndx.hpp
index 1f464ded010..f5ad835b6f3 100644
--- a/ndb/include/kernel/signaldata/AlterIndx.hpp
+++ b/ndb/include/kernel/signaldata/AlterIndx.hpp
@@ -181,6 +181,7 @@ public:
   enum ErrorCode {
     NoError = 0,
     Busy = 701,
+    NotMaster = 702,
     IndexNotFound = 4243,
     IndexExists = 4244,
     BadRequestType = 4247,
@@ -200,8 +201,10 @@ private:
   //Uint32 m_indexVersion;
   Uint32 m_errorCode;
   Uint32 m_errorLine;
-  Uint32 m_errorNode;
-
+  union {
+    Uint32 m_errorNode;
+    Uint32 masterNodeId; // if NotMaster
+  };
 public:
   AlterIndxConf* getConf() {
     return &m_conf;
diff --git a/ndb/include/kernel/signaldata/ArbitSignalData.hpp b/ndb/include/kernel/signaldata/ArbitSignalData.hpp
index f255b8dcbbe..34b73644a13 100644
--- a/ndb/include/kernel/signaldata/ArbitSignalData.hpp
+++ b/ndb/include/kernel/signaldata/ArbitSignalData.hpp
@@ -94,13 +94,14 @@ public:
 
     // arbitration result
     LoseNodes = 41,             // lose on ndb node count
-    WinGroups = 42,             // we win, no need for arbitration
-    LoseGroups = 43,            // we lose, missing node group
-    Partitioning = 44,          // possible network partitioning
-    WinChoose = 45,             // positive reply
-    LoseChoose = 46,            // negative reply
-    LoseNorun = 47,             // arbitrator required but not running
-    LoseNocfg = 48,             // arbitrator required but none configured
+    WinNodes = 42,              // win on ndb node count
+    WinGroups = 43,             // we win, no need for arbitration
+    LoseGroups = 44,            // we lose, missing node group
+    Partitioning = 45,          // possible network partitioning
+    WinChoose = 46,             // positive reply
+    LoseChoose = 47,            // negative reply
+    LoseNorun = 48,             // arbitrator required but not running
+    LoseNocfg = 49,             // arbitrator required but none configured
 
     // general error codes
     ErrTicket = 91,             // invalid arbitrator-ticket
diff --git a/ndb/include/kernel/signaldata/BackupImpl.hpp b/ndb/include/kernel/signaldata/BackupImpl.hpp
index 1872069daa7..2ac91570aad 100644
--- a/ndb/include/kernel/signaldata/BackupImpl.hpp
+++ b/ndb/include/kernel/signaldata/BackupImpl.hpp
@@ -78,15 +78,15 @@ public:
   STATIC_CONST( SignalLength = 3 );
   
   enum ErrorCode {
-    Undefined = 200,
-    FailedToAllocateBuffers = 202,
-    FailedToSetupFsBuffers = 203,
-    FailedToAllocateTables = 204,
-    FailedInsertFileHeader = 205,
-    FailedInsertTableList = 206,
-    FailedAllocateTableMem = 207,
-    FailedToAllocateFileRecord = 208,
-    FailedToAllocateAttributeRecord = 209
+    Undefined = 1340,
+    FailedToAllocateBuffers = 1342,
+    FailedToSetupFsBuffers = 1343,
+    FailedToAllocateTables = 1344,
+    FailedInsertFileHeader = 1345,
+    FailedInsertTableList = 1346,
+    FailedAllocateTableMem = 1347,
+    FailedToAllocateFileRecord = 1348,
+    FailedToAllocateAttributeRecord = 1349
   };
 private:
   Uint32 backupId;
diff --git a/ndb/include/kernel/signaldata/BackupSignalData.hpp b/ndb/include/kernel/signaldata/BackupSignalData.hpp
index 42eb8464d53..fb018026a49 100644
--- a/ndb/include/kernel/signaldata/BackupSignalData.hpp
+++ b/ndb/include/kernel/signaldata/BackupSignalData.hpp
@@ -119,12 +119,13 @@ public:
 
 private:
   enum ErrorCodes {
-    Undefined = 100,
-    IAmNotMaster  = 101,
-    OutOfBackupRecord = 102,
-    OutOfResources = 103,
-    SequenceFailure = 104,
-    BackupDefinitionNotImplemented = 105
+    Undefined = 1300,
+    IAmNotMaster  = 1301,
+    OutOfBackupRecord = 1302,
+    OutOfResources = 1303,
+    SequenceFailure = 1304,
+    BackupDefinitionNotImplemented = 1305,
+    CannotBackupDiskless = 1306
   };
   Uint32 senderData;
   Uint32 errorCode;
@@ -232,13 +233,13 @@ public:
   STATIC_CONST( SignalLength = 3 );
   
   enum RequestType {
-    ClientAbort = 1,
-    BackupComplete = 2,
-    BackupFailure = 3,  // General backup failure coordinator -> slave
-    LogBufferFull = 4,  //                        slave -> coordinator
-    FileOrScanError = 5, //                       slave -> coordinator
-    BackupFailureDueToNodeFail = 6, //             slave -> slave
-    OkToClean = 7                  //             master -> slave
+    ClientAbort = 1321,
+    BackupComplete = 1322,
+    BackupFailure = 1323,  // General backup failure coordinator -> slave
+    LogBufferFull = 1324,  //                        slave -> coordinator
+    FileOrScanError = 1325, //                       slave -> coordinator
+    BackupFailureDueToNodeFail = 1326, //             slave -> slave
+    OkToClean = 1327                  //             master -> slave
   };
 private:
   Uint32 requestType;
diff --git a/ndb/include/kernel/signaldata/BuildIndx.hpp b/ndb/include/kernel/signaldata/BuildIndx.hpp
index 29dfaeb79a6..a6ea84c5ea0 100644
--- a/ndb/include/kernel/signaldata/BuildIndx.hpp
+++ b/ndb/include/kernel/signaldata/BuildIndx.hpp
@@ -234,6 +234,7 @@ public:
   enum ErrorCode {
     NoError = 0,
     Busy = 701,
+    NotMaster = 702,
     BadRequestType = 4247,
     InvalidPrimaryTable = 4249,
     InvalidIndexType = 4250,
@@ -241,9 +242,8 @@ public:
     AllocationFailure = 4252,
     InternalError = 4346
   };
-  STATIC_CONST( SignalLength = BuildIndxConf::SignalLength + 1 );
+  STATIC_CONST( SignalLength = BuildIndxConf::SignalLength + 2 );
 
-private:
   //Uint32 m_userRef;
   //Uint32 m_connectionPtr;
   //Uint32 m_requestInfo;
@@ -252,6 +252,7 @@ private:
   //Uint32 m_indexId;
   BuildIndxConf m_conf;
   Uint32 m_errorCode;
+  Uint32 masterNodeId;
 
 public:
   BuildIndxConf* getConf() {
diff --git a/ndb/include/kernel/signaldata/CreateEvnt.hpp b/ndb/include/kernel/signaldata/CreateEvnt.hpp
index 65a07c122a2..e911fa36ce6 100644
--- a/ndb/include/kernel/signaldata/CreateEvnt.hpp
+++ b/ndb/include/kernel/signaldata/CreateEvnt.hpp
@@ -475,14 +475,14 @@ struct CreateEvntRef {
   }
 };
 inline bool CreateEvntRef::isTemporary() const
-{ return (errorCode &  CreateEvntRef::Temporary) > 0; };
+{ return (errorCode &  CreateEvntRef::Temporary) > 0; }
 inline void CreateEvntRef::setTemporary()
-{ errorCode |=  CreateEvntRef::Temporary; };
+{ errorCode |=  CreateEvntRef::Temporary; }
 inline CreateEvntRef::ErrorCode CreateEvntRef::setTemporary(ErrorCode ec)
 { return (CreateEvntRef::ErrorCode) 
-    (errorCode = ((Uint32) ec | (Uint32)CreateEvntRef::Temporary)); };
+    (errorCode = ((Uint32) ec | (Uint32)CreateEvntRef::Temporary)); }
 inline CreateEvntRef::ErrorCode CreateEvntRef::makeTemporary(ErrorCode ec)
 { return (CreateEvntRef::ErrorCode) 
-    ( (Uint32) ec | (Uint32)CreateEvntRef::Temporary ); };
+    ( (Uint32) ec | (Uint32)CreateEvntRef::Temporary ); }
 
 #endif
diff --git a/ndb/include/kernel/signaldata/CreateIndx.hpp b/ndb/include/kernel/signaldata/CreateIndx.hpp
index 3e277b38dea..5563f80a555 100644
--- a/ndb/include/kernel/signaldata/CreateIndx.hpp
+++ b/ndb/include/kernel/signaldata/CreateIndx.hpp
@@ -184,7 +184,7 @@ public:
 /**
  * CreateIndxRef.
  */
-class CreateIndxRef {
+struct CreateIndxRef {
   friend bool printCREATE_INDX_REF(FILE*, const Uint32*, Uint32, Uint16);
 
 public:
@@ -210,7 +210,6 @@ public:
     InvalidAttributeOrder = 4255
   };
 
-private:
   CreateIndxConf m_conf;
   //Uint32 m_userRef;
   //Uint32 m_connectionPtr;
@@ -221,8 +220,10 @@ private:
   //Uint32 m_indexVersion;
   Uint32 m_errorCode;
   Uint32 m_errorLine;
-  Uint32 m_errorNode;
-
+  union {
+    Uint32 m_errorNode;
+    Uint32 masterNodeId; // If NotMaster
+  };
 public:
   CreateIndxConf* getConf() {
     return &m_conf;
diff --git a/ndb/include/kernel/signaldata/CreateTrig.hpp b/ndb/include/kernel/signaldata/CreateTrig.hpp
index a8de9e50dd4..62627256dcf 100644
--- a/ndb/include/kernel/signaldata/CreateTrig.hpp
+++ b/ndb/include/kernel/signaldata/CreateTrig.hpp
@@ -288,6 +288,7 @@ public:
   enum ErrorCode {
     NoError = 0,
     Busy = 701,
+    NotMaster = 702,
     TriggerNameTooLong = 4236,
     TooManyTriggers = 4237,
     TriggerNotFound = 4238,
@@ -310,8 +311,10 @@ private:
   //Uint32 m_triggerInfo;
   Uint32 m_errorCode;
   Uint32 m_errorLine;
-  Uint32 m_errorNode;
-
+  union {
+    Uint32 m_errorNode;
+    Uint32 masterNodeId; // When NotMaster
+  };
 public:
   CreateTrigConf* getConf() {
     return &m_conf;
diff --git a/ndb/include/kernel/signaldata/DictTabInfo.hpp b/ndb/include/kernel/signaldata/DictTabInfo.hpp
index 6b4a3f34553..a2f9fcc9799 100644
--- a/ndb/include/kernel/signaldata/DictTabInfo.hpp
+++ b/ndb/include/kernel/signaldata/DictTabInfo.hpp
@@ -51,7 +51,6 @@ class DictTabInfo {
   friend class Trix;
   friend class DbUtil;
   // API
-  friend class Table;
   friend class NdbSchemaOp;
   
   /**
@@ -303,15 +302,19 @@ public:
     ExtBigunsigned = NdbSqlUtil::Type::Bigunsigned,
     ExtFloat = NdbSqlUtil::Type::Float,
     ExtDouble = NdbSqlUtil::Type::Double,
-    ExtDecimal = NdbSqlUtil::Type::Decimal,
+    ExtOlddecimal = NdbSqlUtil::Type::Olddecimal,
+    ExtOlddecimalunsigned = NdbSqlUtil::Type::Olddecimalunsigned,
     ExtChar = NdbSqlUtil::Type::Char,
     ExtVarchar = NdbSqlUtil::Type::Varchar,
     ExtBinary = NdbSqlUtil::Type::Binary,
     ExtVarbinary = NdbSqlUtil::Type::Varbinary,
     ExtDatetime = NdbSqlUtil::Type::Datetime,
-    ExtTimespec = NdbSqlUtil::Type::Timespec,
+    ExtDate = NdbSqlUtil::Type::Date,
     ExtBlob = NdbSqlUtil::Type::Blob,
-    ExtText = NdbSqlUtil::Type::Text
+    ExtText = NdbSqlUtil::Type::Text,
+    ExtTime = NdbSqlUtil::Type::Time,
+    ExtYear = NdbSqlUtil::Type::Year,
+    ExtTimestamp = NdbSqlUtil::Type::Timestamp
   };
 
   // Attribute data interpretation
@@ -409,9 +412,20 @@ public:
         AttributeSize = DictTabInfo::a64Bit;
         AttributeArraySize = AttributeExtLength;
         return true;
-      case DictTabInfo::ExtDecimal:
-        // not yet implemented anywhere
-        break;
+      case DictTabInfo::ExtOlddecimal:
+        AttributeType = DictTabInfo::StringType;
+        AttributeSize = DictTabInfo::an8Bit;
+        AttributeArraySize =
+          (1 + AttributeExtPrecision + (int(AttributeExtScale) > 0)) *
+          AttributeExtLength;
+        return true;
+      case DictTabInfo::ExtOlddecimalunsigned:
+        AttributeType = DictTabInfo::StringType;
+        AttributeSize = DictTabInfo::an8Bit;
+        AttributeArraySize =
+          (0 + AttributeExtPrecision + (int(AttributeExtScale) > 0)) *
+          AttributeExtLength;
+        return true;
       case DictTabInfo::ExtChar:
       case DictTabInfo::ExtBinary:
         AttributeType = DictTabInfo::StringType;
@@ -429,10 +443,10 @@ public:
         AttributeSize = DictTabInfo::an8Bit;
         AttributeArraySize = 8 * AttributeExtLength;
         return true;
-      case DictTabInfo::ExtTimespec:
+      case DictTabInfo::ExtDate:
         AttributeType = DictTabInfo::StringType;
         AttributeSize = DictTabInfo::an8Bit;
-        AttributeArraySize = 12 * AttributeExtLength;
+        AttributeArraySize = 3 * AttributeExtLength;
         return true;
       case DictTabInfo::ExtBlob:
       case DictTabInfo::ExtText:
@@ -441,6 +455,21 @@ public:
         // head + inline part [ attr precision lower half ]
         AttributeArraySize = (NDB_BLOB_HEAD_SIZE << 2) + (AttributeExtPrecision & 0xFFFF);
         return true;
+      case DictTabInfo::ExtTime:
+        AttributeType = DictTabInfo::StringType;
+        AttributeSize = DictTabInfo::an8Bit;
+        AttributeArraySize = 3 * AttributeExtLength;
+        return true;
+      case DictTabInfo::ExtYear:
+        AttributeType = DictTabInfo::StringType;
+        AttributeSize = DictTabInfo::an8Bit;
+        AttributeArraySize = 1 * AttributeExtLength;
+        return true;
+      case DictTabInfo::ExtTimestamp:
+        AttributeType = DictTabInfo::StringType;
+        AttributeSize = DictTabInfo::an8Bit;
+        AttributeArraySize = 4 * AttributeExtLength;
+        return true;
       };
       return false;
     }
diff --git a/ndb/include/kernel/signaldata/DropIndx.hpp b/ndb/include/kernel/signaldata/DropIndx.hpp
index 0c0cf31aec8..fd2ea7f0b7b 100644
--- a/ndb/include/kernel/signaldata/DropIndx.hpp
+++ b/ndb/include/kernel/signaldata/DropIndx.hpp
@@ -160,7 +160,7 @@ public:
 /**
  * DropIndxRef.
  */
-class DropIndxRef {
+struct DropIndxRef {
   friend bool printDROP_INDX_REF(FILE*, const Uint32*, Uint32, Uint16);
 
 public:
@@ -168,6 +168,7 @@ public:
     NoError = 0,
     InvalidIndexVersion = 241,
     Busy = 701,
+    NotMaster = 702,
     IndexNotFound = 4243,
     BadRequestType = 4247,
     InvalidName = 4248,
@@ -175,7 +176,6 @@ public:
   };
   STATIC_CONST( SignalLength = DropIndxConf::SignalLength + 3 );
 
-private:
   DropIndxConf m_conf;
   //Uint32 m_userRef;
   //Uint32 m_connectionPtr;
@@ -185,8 +185,10 @@ private:
   //Uint32 m_indexVersion;
   Uint32 m_errorCode;
   Uint32 m_errorLine;
-  Uint32 m_errorNode;
-
+  union {
+    Uint32 m_errorNode;
+    Uint32 masterNodeId;
+  };
 public:
   DropIndxConf* getConf() {
     return &m_conf;
diff --git a/ndb/include/kernel/signaldata/FsCloseReq.hpp b/ndb/include/kernel/signaldata/FsCloseReq.hpp
index c42afa143e6..10d094fb30b 100644
--- a/ndb/include/kernel/signaldata/FsCloseReq.hpp
+++ b/ndb/include/kernel/signaldata/FsCloseReq.hpp
@@ -75,7 +75,7 @@ inline
 void
 FsCloseReq::setRemoveFileFlag(UintR & fileflag, bool removefile){
 //  ASSERT_BOOL(removefile, "FsCloseReq::setRemoveFileFlag");
-  if (removefile == true)
+  if (removefile)
     fileflag = 1;
   else
     fileflag = 0;
diff --git a/ndb/include/kernel/signaldata/PackedSignal.hpp b/ndb/include/kernel/signaldata/PackedSignal.hpp
index 057bb39b25a..ea0ff6db526 100644
--- a/ndb/include/kernel/signaldata/PackedSignal.hpp
+++ b/ndb/include/kernel/signaldata/PackedSignal.hpp
@@ -38,6 +38,6 @@ class PackedSignal {
 };
 
 inline
-Uint32 PackedSignal::getSignalType(Uint32 data) { return data >> 28; };
+Uint32 PackedSignal::getSignalType(Uint32 data) { return data >> 28; }
 
 #endif
diff --git a/ndb/include/kernel/signaldata/RepImpl.hpp b/ndb/include/kernel/signaldata/RepImpl.hpp
index affffe46f9c..0de1389a4a9 100644
--- a/ndb/include/kernel/signaldata/RepImpl.hpp
+++ b/ndb/include/kernel/signaldata/RepImpl.hpp
@@ -93,7 +93,7 @@ public:
   Uint32 subscriptionId;
   Uint32 subscriptionKey;
   Uint32 senderNodeId;
-  GrepError::Code err;
+  GrepError::GE_Code err;
 };
 
 class RepGetGciReq 
@@ -151,7 +151,7 @@ public:
   Uint32 lastPSGCI;
   Uint32 firstSSGCI;
   Uint32 lastSSGCI;
-  GrepError::Code err;
+  GrepError::GE_Code err;
 };
 
 class RepGetGciBufferReq {
@@ -213,7 +213,7 @@ public:
   Uint32 lastSSGCI;
   Uint32 currentGCIBuffer;
   Uint32 nodeGrp;
-  GrepError::Code err;
+  GrepError::GE_Code err;
 };
 
 class RepInsertGciBufferReq 
@@ -252,7 +252,7 @@ public:
   Uint32 nodeGrp;
   Uint32 tableId;
   Uint32 force;
-  GrepError::Code err;
+  GrepError::GE_Code err;
 };
 
 class RepInsertGciBufferConf 
@@ -310,7 +310,7 @@ public:
   Uint32 lastGCI;
   Uint32 currentGCI;
   Uint32 nodeGrp;
-  GrepError::Code err;
+  GrepError::GE_Code err;
 };
 
 class RepClearPSGciBufferConf 
@@ -367,7 +367,7 @@ public:
   Uint32 lastGCI;
   Uint32 currentGCI;
   Uint32 nodeGrp;
-  GrepError::Code err;
+  GrepError::GE_Code err;
 };
 
 class RepClearSSGciBufferConf 
diff --git a/ndb/include/kernel/signaldata/SumaImpl.hpp b/ndb/include/kernel/signaldata/SumaImpl.hpp
index 089132cd9aa..89ade067dcd 100644
--- a/ndb/include/kernel/signaldata/SumaImpl.hpp
+++ b/ndb/include/kernel/signaldata/SumaImpl.hpp
@@ -159,12 +159,12 @@ public:
   Uint32 subscriberRef;
 };
 inline bool SubStartRef::isTemporary() const
-{ return (errorCode &  SubStartRef::Temporary) > 0; };
+{ return (errorCode &  SubStartRef::Temporary) > 0; }
 inline void SubStartRef::setTemporary()
-{ errorCode |=  SubStartRef::Temporary; };
+{ errorCode |=  SubStartRef::Temporary; }
 inline SubStartRef::ErrorCode SubStartRef::setTemporary(ErrorCode ec)
 { return (SubStartRef::ErrorCode) 
-    (errorCode = ((Uint32) ec | (Uint32)SubStartRef::Temporary)); };
+    (errorCode = ((Uint32) ec | (Uint32)SubStartRef::Temporary)); }
 
 class SubStartConf {
   /**
@@ -239,12 +239,12 @@ public:
   };
 };
 inline bool SubStopRef::isTemporary() const
-{ return (errorCode &  SubStopRef::Temporary) > 0; };
+{ return (errorCode &  SubStopRef::Temporary) > 0; }
 inline void SubStopRef::setTemporary()
-{ errorCode |=  SubStopRef::Temporary; };
+{ errorCode |=  SubStopRef::Temporary; }
 inline SubStopRef::ErrorCode SubStopRef::setTemporary(ErrorCode ec)
 { return (SubStopRef::ErrorCode) 
-    (errorCode = ((Uint32) ec | (Uint32)SubStopRef::Temporary)); };
+    (errorCode = ((Uint32) ec | (Uint32)SubStopRef::Temporary)); }
 
 class SubStopConf {
   /**
@@ -515,12 +515,12 @@ public:
   };
 };
 inline bool SubRemoveRef::isTemporary() const
-{ return (err &  SubRemoveRef::Temporary) > 0; };
+{ return (err &  SubRemoveRef::Temporary) > 0; }
 inline void SubRemoveRef::setTemporary()
-{ err |=  SubRemoveRef::Temporary; };
+{ err |=  SubRemoveRef::Temporary; }
 inline SubRemoveRef::ErrorCode SubRemoveRef::setTemporary(ErrorCode ec)
 { return (SubRemoveRef::ErrorCode) 
-    (errorCode = ((Uint32) ec | (Uint32)SubRemoveRef::Temporary)); };
+    (errorCode = ((Uint32) ec | (Uint32)SubRemoveRef::Temporary)); }
 
 class SubRemoveConf {
   /**
diff --git a/ndb/include/kernel/signaldata/TupFrag.hpp b/ndb/include/kernel/signaldata/TupFrag.hpp
index c1e861c5dff..c132b19c50a 100644
--- a/ndb/include/kernel/signaldata/TupFrag.hpp
+++ b/ndb/include/kernel/signaldata/TupFrag.hpp
@@ -132,9 +132,10 @@ class TupAddAttrConf {
   friend class Dblqh;
   friend class Dbtup;
 public:
-  STATIC_CONST( SignalLength = 1 );
+  STATIC_CONST( SignalLength = 2 );
 private:
   Uint32 userPtr;
+  Uint32 lastAttr; // bool: got last attr and closed frag op
 };
 
 class TupAddAttrRef {
@@ -171,9 +172,10 @@ class TuxAddAttrConf {
   friend class Dblqh;
   friend class Dbtux;
 public:
-  STATIC_CONST( SignalLength = 1 );
+  STATIC_CONST( SignalLength = 2 );
 private:
   Uint32 userPtr;
+  Uint32 lastAttr; // bool: got last attr and closed frag op
 };
 
 class TuxAddAttrRef {
diff --git a/ndb/include/kernel/signaldata/UtilLock.hpp b/ndb/include/kernel/signaldata/UtilLock.hpp
index 1cac467daa0..318024fd706 100644
--- a/ndb/include/kernel/signaldata/UtilLock.hpp
+++ b/ndb/include/kernel/signaldata/UtilLock.hpp
@@ -39,7 +39,7 @@ public:
   enum RequestInfo {
     TryLock = 1
   };
-private:
+public:
   Uint32 senderData;  
   Uint32 senderRef;
   Uint32 lockId;
@@ -63,7 +63,7 @@ class UtilLockConf {
 public:
   STATIC_CONST( SignalLength = 4 );
   
-private:
+public:
   Uint32 senderData;
   Uint32 senderRef;
   Uint32 lockId;
@@ -95,7 +95,7 @@ public:
     LockAlreadyHeld = 4
     
   };
-private:
+public:
   Uint32 senderData;
   Uint32 senderRef;
   Uint32 lockId;
@@ -119,7 +119,7 @@ class UtilUnlockReq {
 public:
   STATIC_CONST( SignalLength = 4 );
   
-private:
+public:
   Uint32 senderData;  
   Uint32 senderRef;
   Uint32 lockId;
@@ -143,7 +143,7 @@ class UtilUnlockConf {
 public:
   STATIC_CONST( SignalLength = 3 );
   
-private:
+public:
   Uint32 senderData;
   Uint32 senderRef;
   Uint32 lockId;
@@ -171,7 +171,7 @@ public:
     NoSuchLock = 1,
     NotLockOwner = 2
   };
-private:
+public:
   Uint32 senderData;
   Uint32 senderRef;
   Uint32 lockId;
@@ -200,7 +200,7 @@ public:
 
   STATIC_CONST( SignalLength = 4 );
 
-private:
+public:
   Uint32 senderData;
   Uint32 senderRef;
   Uint32 lockId;
@@ -229,7 +229,7 @@ public:
 
   STATIC_CONST( SignalLength = 4 );
 
-private:
+public:
   Uint32 senderData;
   Uint32 senderRef;
   Uint32 lockId;
@@ -251,7 +251,7 @@ class UtilCreateLockConf {
 public:
   STATIC_CONST( SignalLength = 3 );
 
-private:
+public:
   Uint32 senderData;
   Uint32 senderRef;
   Uint32 lockId;
@@ -275,7 +275,7 @@ class UtilDestroyLockReq {
 public:
   STATIC_CONST( SignalLength = 4 );
 
-private:
+public:
   Uint32 senderData;
   Uint32 senderRef;
   Uint32 lockId;
@@ -303,7 +303,7 @@ public:
 
   STATIC_CONST( SignalLength = 4 );
 
-private:
+public:
   Uint32 senderData;
   Uint32 senderRef;
   Uint32 lockId;
@@ -325,7 +325,7 @@ class UtilDestroyLockConf {
 public:
   STATIC_CONST( SignalLength = 3 );
 
-private:
+public:
   Uint32 senderData;
   Uint32 senderRef;
   Uint32 lockId;