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/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

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,

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,

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;

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,

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;

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

@@ -6114,11 +6114,21 @@ Dbdict::execCREATE_INDX_REQ(Signal* signal)
       jam();
       if (getOwnNodeId() != c_masterNodeId) {
         jam();
-        // forward to DICT master
-        sendSignal(calcDictBlockRef(c_masterNodeId), GSN_CREATE_INDX_REQ,
-            signal, signal->getLength(), JBB);
-        return;
+	
+	releaseSections(signal);
+	OpCreateIndex opBusy;
+	opPtr.p = &opBusy;
+	opPtr.p->save(req);
+	opPtr.p->m_isMaster = (senderRef == reference());
+	opPtr.p->key = 0;
+	opPtr.p->m_requestType = CreateIndxReq::RT_DICT_PREPARE;
+	opPtr.p->m_errorCode = CreateIndxRef::NotMaster;
+	opPtr.p->m_errorLine = __LINE__;
+	opPtr.p->m_errorNode = c_masterNodeId;
+	createIndex_sendReply(signal, opPtr, true);
+	return;
       }
+      
       // forward initial request plus operation key to all
       req->setOpKey(++c_opRecordSequence);
       NodeReceiverGroup rg(DBDICT, c_aliveNodes);
@@ -6644,10 +6654,9 @@ Dbdict::execDROP_INDX_REQ(Signal* signal)
       jam();
       if (getOwnNodeId() != c_masterNodeId) {
         jam();
-        // forward to DICT master
-        sendSignal(calcDictBlockRef(c_masterNodeId), GSN_DROP_INDX_REQ,
-            signal, signal->getLength(), JBB);
-        return;
+
+	err = DropIndxRef::NotMaster;
+	goto error;
       }
       // forward initial request plus operation key to all
       Uint32 indexId= req->getIndexId();
@@ -6735,6 +6744,7 @@ Dbdict::execDROP_INDX_REQ(Signal* signal)
   opPtr.p->save(req);
   opPtr.p->m_errorCode = (DropIndxRef::ErrorCode)err;
   opPtr.p->m_errorLine = __LINE__;
+  opPtr.p->m_errorNode = c_masterNodeId;
   dropIndex_sendReply(signal, opPtr, true);
 }
 
@@ -9173,9 +9183,15 @@ Dbdict::execALTER_INDX_REQ(Signal* signal)
       jam();
       if (! isLocal && getOwnNodeId() != c_masterNodeId) {
         jam();
-        // forward to DICT master
-        sendSignal(calcDictBlockRef(c_masterNodeId), GSN_ALTER_INDX_REQ,
-            signal, signal->getLength(), JBB);
+
+	releaseSections(signal);
+	OpAlterIndex opBad;
+	opPtr.p = &opBad;
+	opPtr.p->save(req);
+	opPtr.p->m_errorCode = AlterIndxRef::NotMaster;
+	opPtr.p->m_errorLine = __LINE__;
+	opPtr.p->m_errorNode = c_masterNodeId;
+	alterIndex_sendReply(signal, opPtr, true);
         return;
       }
       // forward initial request plus operation key to all
@@ -9853,9 +9869,15 @@ Dbdict::execBUILDINDXREQ(Signal* signal)
       jam();
       if (getOwnNodeId() != c_masterNodeId) {
         jam();
-        // forward to DICT master
-        sendSignal(calcDictBlockRef(c_masterNodeId), GSN_BUILDINDXREQ,
-            signal, signal->getLength(), JBB);
+
+	releaseSections(signal);
+	OpBuildIndex opBad;
+	opPtr.p = &opBad;
+	opPtr.p->save(req);
+	opPtr.p->m_errorCode = BuildIndxRef::NotMaster;
+	opPtr.p->m_errorLine = __LINE__;
+	opPtr.p->m_errorNode = c_masterNodeId;
+	buildIndex_sendReply(signal, opPtr, true);
         return;
       }
       // forward initial request plus operation key to all
@@ -10319,9 +10341,15 @@ Dbdict::execCREATE_TRIG_REQ(Signal* signal)
       jam();
       if (! isLocal && getOwnNodeId() != c_masterNodeId) {
         jam();
-        // forward to DICT master
-        sendSignal(calcDictBlockRef(c_masterNodeId), GSN_CREATE_TRIG_REQ,
-            signal, signal->getLength(), JBB);
+
+	releaseSections(signal);
+	OpCreateTrigger opBad;
+	opPtr.p = &opBad;
+	opPtr.p->save(req);
+	opPtr.p->m_errorCode = CreateTrigRef::NotMaster;
+	opPtr.p->m_errorLine = __LINE__;
+	opPtr.p->m_errorNode = c_masterNodeId;
+	createTrigger_sendReply(signal,  opPtr, true);
         return;
       }
       // forward initial request plus operation key to all

ndb/src/ndbapi/NdbDictionaryImpl.cpp

@@ -1008,6 +1008,12 @@ NdbDictInterface::dictSignal(NdbApiSignal* signal,
     if(m_waiter.m_state == WAIT_NODE_FAILURE)
       continue;
 
+    if(m_waiter.m_state == WST_WAIT_TIMEOUT)
+    {
+      m_error.code = 4008;
+      DBUG_RETURN(-1);
+    }
+    
     if ( (temporaryMask & m_error.code) != 0 ) {
       continue;
     }
@@ -2185,8 +2191,8 @@ int
 NdbDictInterface::createIndex(NdbApiSignal* signal, 
 			      LinearSectionPtr ptr[3])
 {
-  const int noErrCodes = 1;
-  int errCodes[noErrCodes] = {CreateIndxRef::Busy};
+  const int noErrCodes = 2;
+  int errCodes[noErrCodes] = {CreateIndxRef::Busy, CreateIndxRef::NotMaster};
   return dictSignal(signal,ptr,2,
 		    1 /*use masternode id*/,
 		    100,
@@ -2210,6 +2216,8 @@ 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_waiter.signal(NO_WAIT);  
 }
 
@@ -2306,8 +2314,8 @@ NdbDictInterface::dropIndex(const NdbIndexImpl & impl,
 int
 NdbDictInterface::dropIndex(NdbApiSignal* signal, LinearSectionPtr ptr[3])
 {
-  const int noErrCodes = 1;
-  int errCodes[noErrCodes] = {DropIndxRef::Busy};
+  const int noErrCodes = 2;
+  int errCodes[noErrCodes] = {DropIndxRef::Busy, DropIndxRef::NotMaster};
   int r = dictSignal(signal,NULL,0,
 		     1/*Use masternode id*/,
 		     100,
@@ -2334,6 +2342,8 @@ 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_waiter.signal(NO_WAIT);  
 }
 

ndb/src/ndbapi/ndb_cluster_connection.cpp

@@ -225,7 +225,8 @@ Ndb_cluster_connection::wait_until_ready(int timeout,
     else if (foundAliveNode > 0)
     {
       noChecksSinceFirstAliveFound++;
-      if (noChecksSinceFirstAliveFound > timeout_after_first_alive)
+      // 100 ms delay -> 10*
+      if (noChecksSinceFirstAliveFound > 10*timeout_after_first_alive)
 	DBUG_RETURN(1);
     }
     else if (secondsCounter >= timeout)

sql/ha_ndbcluster.cc

@@ -4634,7 +4634,7 @@ ndbcluster_init()
     DBUG_PRINT("info",("NDBCLUSTER storage engine at %s on port %d",
 		       g_ndb_cluster_connection->get_connected_host(),
 		       g_ndb_cluster_connection->get_connected_port()));
-    g_ndb_cluster_connection->wait_until_ready(10,0);
+    g_ndb_cluster_connection->wait_until_ready(10,3);
   } 
   else if(res == 1)
   {