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

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


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

5 files changed, 6 insertions, 4 deletions

diff --git a/ndb/include/kernel/signaldata/AlterIndx.hpp b/ndb/include/kernel/signaldata/AlterIndx.hpp
index 1f464ded010..4c8bb465cf1 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,
diff --git a/ndb/include/kernel/signaldata/BuildIndx.hpp b/ndb/include/kernel/signaldata/BuildIndx.hpp
index 29dfaeb79a6..e8eca03ea81 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,
diff --git a/ndb/include/kernel/signaldata/CreateIndx.hpp b/ndb/include/kernel/signaldata/CreateIndx.hpp
index 3e277b38dea..2751cfbbbfa 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;
diff --git a/ndb/include/kernel/signaldata/CreateTrig.hpp b/ndb/include/kernel/signaldata/CreateTrig.hpp
index a8de9e50dd4..4af9cb57f68 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,
diff --git a/ndb/include/kernel/signaldata/DropIndx.hpp b/ndb/include/kernel/signaldata/DropIndx.hpp
index 0c0cf31aec8..247fbdf914e 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;