summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <tomas@poseidon.ndb.mysql.com>2004-10-22 15:22:47 +0000
committerunknown <tomas@poseidon.ndb.mysql.com>2004-10-22 15:22:47 +0000
commitf74303af57130ef84cfb796de058db3e10a868e9 (patch)
tree15850c35d5dba998630c569c3ea662dde7012b10
parent8c391e7c2c0ef35645c3bee66d4c68f03b5c994e (diff)
parent2f6dc4705d49fd4c4e4284b07441edc5ff484283 (diff)
downloadmariadb-git-f74303af57130ef84cfb796de058db3e10a868e9.tar.gz
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
-rw-r--r--configure.in1
-rw-r--r--ndb/include/kernel/signaldata/UpgradeStartup.hpp2
-rw-r--r--ndb/include/ndb_global.h3
-rw-r--r--ndb/include/ndb_types.h2
-rw-r--r--ndb/include/ndbapi/Ndb.hpp1
-rw-r--r--ndb/include/ndbapi/NdbReceiver.hpp2
-rw-r--r--ndb/include/ndbapi/NdbScanOperation.hpp1
-rw-r--r--ndb/src/common/util/ConfigValues.cpp7
-rw-r--r--ndb/src/kernel/blocks/backup/restore/Restore.hpp2
-rw-r--r--ndb/src/kernel/blocks/dbtup/Dbtup.hpp16
-rw-r--r--ndb/src/mgmsrv/SignalQueue.cpp3
-rw-r--r--ndb/tools/waiter.cpp2
12 files changed, 24 insertions, 18 deletions
diff --git a/configure.in b/configure.in
index 09999285275..810f6c31c49 100644
--- a/configure.in
+++ b/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
diff --git a/ndb/include/kernel/signaldata/UpgradeStartup.hpp b/ndb/include/kernel/signaldata/UpgradeStartup.hpp
index badc7ca0e4d..a4450221c59 100644
--- a/ndb/include/kernel/signaldata/UpgradeStartup.hpp
+++ b/ndb/include/kernel/signaldata/UpgradeStartup.hpp
@@ -1,6 +1,8 @@
#ifndef NDB_UPGRADE_STARTUP
#define NDB_UPGRADE_STARTUP
+class Ndbcntr;
+
struct UpgradeStartup {
static void installEXEC(SimulatedBlock*);
diff --git a/ndb/include/ndb_global.h b/ndb/include/ndb_global.h
index 3ce37a2edee..c128323241a 100644
--- a/ndb/include/ndb_global.h
+++ b/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>
diff --git a/ndb/include/ndb_types.h b/ndb/include/ndb_types.h
index 87ebd3d6c6b..a2988dbae78 100644
--- a/ndb/include/ndb_types.h
+++ b/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
diff --git a/ndb/include/ndbapi/Ndb.hpp b/ndb/include/ndbapi/Ndb.hpp
index 134a48e1d6d..5ec09269695 100644
--- a/ndb/include/ndbapi/Ndb.hpp
+++ b/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*);
diff --git a/ndb/include/ndbapi/NdbReceiver.hpp b/ndb/include/ndbapi/NdbReceiver.hpp
index 6f577380728..b95313db274 100644
--- a/ndb/include/ndbapi/NdbReceiver.hpp
+++ b/ndb/include/ndbapi/NdbReceiver.hpp
@@ -22,6 +22,8 @@
#include <ndb_global.h>
class Ndb;
+class NdbConnection;
+
class NdbReceiver
{
friend class Ndb;
diff --git a/ndb/include/ndbapi/NdbScanOperation.hpp b/ndb/include/ndbapi/NdbScanOperation.hpp
index a1c66b380a7..2e4d173ac75 100644
--- a/ndb/include/ndbapi/NdbScanOperation.hpp
+++ b/ndb/include/ndbapi/NdbScanOperation.hpp
@@ -32,6 +32,7 @@
#include <NdbOperation.hpp>
class NdbBlob;
+class NdbResultSet;
/**
* @class NdbScanOperation
diff --git a/ndb/src/common/util/ConfigValues.cpp b/ndb/src/common/util/ConfigValues.cpp
index 8a14882550c..5c4b17c73ca 100644
--- a/ndb/src/common/util/ConfigValues.cpp
+++ b/ndb/src/common/util/ConfigValues.cpp
@@ -1,9 +1,6 @@
+
+#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>
diff --git a/ndb/src/kernel/blocks/backup/restore/Restore.hpp b/ndb/src/kernel/blocks/backup/restore/Restore.hpp
index 8ca68fd9b23..0ec1ab852e9 100644
--- a/ndb/src/kernel/blocks/backup/restore/Restore.hpp
+++ b/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 &);
diff --git a/ndb/src/kernel/blocks/dbtup/Dbtup.hpp b/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
index 0e8dd5fbbe8..55ad1d0910a 100644
--- a/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
+++ b/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,
diff --git a/ndb/src/mgmsrv/SignalQueue.cpp b/ndb/src/mgmsrv/SignalQueue.cpp
index 7003f5c0a89..08ad5f363a6 100644
--- a/ndb/src/mgmsrv/SignalQueue.cpp
+++ b/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() {
diff --git a/ndb/tools/waiter.cpp b/ndb/tools/waiter.cpp
index c27b46c9356..6dcea6ccc48 100644
--- a/ndb/tools/waiter.cpp
+++ b/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>