Merge mysql.com:/home/jonas/src/fix

into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

ndb/include/kernel/signaldata/AlterIndx.hpp

@@ -201,8 +201,10 @@ private:
   //Uint32 m_indexVersion;
   Uint32 m_errorCode;
   Uint32 m_errorLine;
+  union {
     Uint32 m_errorNode;
-
+    Uint32 masterNodeId; // if NotMaster
+  };
 public:
   AlterIndxConf* getConf() {
     return &m_conf;

ndb/include/kernel/signaldata/BuildIndx.hpp

@@ -242,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;
@@ -253,6 +252,7 @@ private:
   //Uint32 m_indexId;
   BuildIndxConf m_conf;
   Uint32 m_errorCode;
+  Uint32 masterNodeId;
 
 public:
   BuildIndxConf* getConf() {

ndb/include/kernel/signaldata/CreateIndx.hpp

@@ -220,8 +220,10 @@ public:
   //Uint32 m_indexVersion;
   Uint32 m_errorCode;
   Uint32 m_errorLine;
+  union {
     Uint32 m_errorNode;
-
+    Uint32 masterNodeId; // If NotMaster
+  };
 public:
   CreateIndxConf* getConf() {
     return &m_conf;

ndb/include/kernel/signaldata/CreateTrig.hpp

@@ -311,8 +311,10 @@ private:
   //Uint32 m_triggerInfo;
   Uint32 m_errorCode;
   Uint32 m_errorLine;
+  union {
     Uint32 m_errorNode;
-
+    Uint32 masterNodeId; // When NotMaster
+  };
 public:
   CreateTrigConf* getConf() {
     return &m_conf;

ndb/include/kernel/signaldata/DropIndx.hpp

@@ -185,8 +185,10 @@ public:
   //Uint32 m_indexVersion;
   Uint32 m_errorCode;
   Uint32 m_errorLine;
+  union {
     Uint32 m_errorNode;
-
+    Uint32 masterNodeId;
+  };
 public:
   DropIndxConf* getConf() {
     return &m_conf;

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

@@ -10293,6 +10293,7 @@ Dbdict::buildIndex_sendReply(Signal* signal, OpBuildIndexPtr opPtr,
   rep->setIndexId(opPtr.p->m_request.getIndexId());
   if (sendRef) {
     rep->setErrorCode(opPtr.p->m_errorCode);
+    rep->masterNodeId = opPtr.p->m_errorNode;
     gsn = GSN_BUILDINDXREF;
     length = BuildIndxRef::SignalLength;
   }

ndb/src/ndbapi/NdbDictionaryImpl.cpp

@@ -2217,7 +2217,7 @@ NdbDictInterface::execCREATE_INDX_REF(NdbApiSignal * signal,
   const CreateIndxRef* const ref = CAST_CONSTPTR(CreateIndxRef, signal->getDataPtr());
   m_error.code = ref->getErrorCode();
   if(m_error.code == ref->NotMaster)
-    m_masterNodeId= ref->m_errorNode;
+    m_masterNodeId= ref->masterNodeId;
   m_waiter.signal(NO_WAIT);  
 }
 
@@ -2343,7 +2343,7 @@ NdbDictInterface::execDROP_INDX_REF(NdbApiSignal * signal,
   const DropIndxRef* const ref = CAST_CONSTPTR(DropIndxRef, signal->getDataPtr());
   m_error.code = ref->getErrorCode();
   if(m_error.code == ref->NotMaster)
-    m_masterNodeId= ref->m_errorNode;
+    m_masterNodeId= ref->masterNodeId;
   m_waiter.signal(NO_WAIT);  
 }