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

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

configure.in

@@ -1144,6 +1144,7 @@ dnl Is this the right match for DEC OSF on alpha?
       # gethostbyname_r is deprecated and doesn't work ok on OSF1
       CFLAGS="$CFLAGS -DUNDEF_HAVE_GETHOSTBYNAME_R"
       CXXFLAGS="$CXXFLAGS -DUNDEF_HAVE_GETHOSTBYNAME_R"
+      ndb_cxxflags_fix="$ndb_cxxflags_fix -I/usr/include.dtk"
     ;;
   *netware*)
     # No need for curses library so set it to null

ndb/include/kernel/signaldata/UpgradeStartup.hpp

 #ifndef NDB_UPGRADE_STARTUP
 #define NDB_UPGRADE_STARTUP
 
+class Ndbcntr;
+
 struct UpgradeStartup {
 
   static void installEXEC(SimulatedBlock*);

ndb/include/ndb_global.h

@@ -13,6 +13,9 @@
 #undef NDB_WIN32
 #endif
 
+#ifdef _AIX
+#undef _H_STRINGS
+#endif
 #include <m_string.h>
 #include <m_ctype.h>
 #include <ndb_types.h>

ndb/include/ndb_types.h

@@ -33,7 +33,7 @@ typedef unsigned int UintR;
 #ifdef __SIZE_TYPE__
 typedef __SIZE_TYPE__ UintPtr;
 #else
-#include <my_global.h>
+#include <ndb_global.h>
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
 #endif

ndb/include/ndbapi/Ndb.hpp

@@ -881,6 +881,7 @@ class Table;
 class BaseString;
 class NdbEventOperation;
 class NdbBlob;
+class NdbReceiver;
 
 typedef void (* NdbEventCallback)(NdbEventOperation*, Ndb*, void*);
 

ndb/include/ndbapi/NdbReceiver.hpp

@@ -22,6 +22,8 @@
 #include <ndb_global.h>
 
 class Ndb;
+class NdbConnection;
+
 class NdbReceiver
 {
   friend class Ndb;

ndb/include/ndbapi/NdbScanOperation.hpp

@@ -32,6 +32,7 @@
 #include <NdbOperation.hpp>
 
 class NdbBlob;
+class NdbResultSet;
 
 /**
  * @class NdbScanOperation

ndb/src/common/util/ConfigValues.cpp

+
+#include <ndb_global.h>
 #include <ConfigValues.hpp>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <new>
 #include <NdbOut.hpp>
 #include <NdbTCP.h>
 

ndb/src/kernel/blocks/backup/restore/Restore.hpp

@@ -91,7 +91,7 @@ class TupleS {
 private:
   friend class RestoreDataIterator;
   
-  TableS *m_currentTable;
+  class TableS *m_currentTable;
   AttributeData *allAttrData;
   bool prepareRecord(TableS &);
   

ndb/src/kernel/blocks/dbtup/Dbtup.hpp

@@ -35,14 +35,6 @@
 #define ZMIN_PAGE_LIMIT_TUPKEYREQ 5
 #define ZTUP_VERSION_BITS 15
 
-typedef bool (Dbtup::* ReadFunction)(Uint32*,
-                                     AttributeHeader*,
-                                     Uint32,
-                                     Uint32);
-typedef bool (Dbtup::* UpdateFunction)(Uint32*,
-                                       Uint32,
-                                       Uint32);
-
 #ifdef DBTUP_C
 //------------------------------------------------------------------
 // Jam Handling:
@@ -351,6 +343,14 @@ typedef bool (Dbtup::* UpdateFunction)(Uint32*,
 
 class Dbtup: public SimulatedBlock {
 public:
+
+  typedef bool (Dbtup::* ReadFunction)(Uint32*,
+                                       AttributeHeader*,
+                                       Uint32,
+                                       Uint32);
+  typedef bool (Dbtup::* UpdateFunction)(Uint32*,
+                                         Uint32,
+                                         Uint32);
 // State values
 enum State {
   NOT_INITIALIZED = 0,

ndb/src/mgmsrv/SignalQueue.cpp

@@ -14,8 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <string.h>
-
+#include <ndb_global.h>
 #include "SignalQueue.hpp"
 
 SignalQueue::SignalQueue() {

ndb/tools/waiter.cpp

@@ -15,8 +15,8 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#include <ndb_global.h>
 #include <mgmapi.h>
-#include <string.h>
 #include <NdbMain.h>
 #include <NdbOut.hpp>
 #include <NdbSleep.h>