database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

AIX compile fixes

Browse Source 
ndb/include/kernel/signaldata/UpgradeStartup.hpp:
  Forward declaration
ndb/include/ndb_global.h:
  Fix for AIX
ndb/include/ndb_types.h:
  Always use ndb_global instead of my_global (or anything else)
ndb/include/ndbapi/Ndb.hpp:
  Forward declaration
ndb/include/ndbapi/NdbReceiver.hpp:
  Forward declaration
ndb/include/ndbapi/NdbScanOperation.hpp:
  Forward declaration
ndb/src/common/util/ConfigValues.cpp:
  Always use ndb_global instead of my_global (or anything else)
ndb/src/kernel/blocks/backup/restore/Restore.hpp:
  Forward declaration
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Move read/update function into Dbtup
ndb/src/mgmsrv/SignalQueue.cpp:
  Always use ndb_global instead of my_global (or anything else)
ndb/tools/waiter.cpp:
  Always use ndb_global instead of my_global (or anything else)
This commit is contained in:
unknown
2004-10-22 15:13:06 +00:00
parent 76b09dd518
commit 27fa5d4853
11 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ndb/include/kernel/signaldata/UpgradeStartup.hpp
View File

@ -1,6 +1,8 @@
#ifndef NDB_UPGRADE_STARTUP #ifndef NDB_UPGRADE_STARTUP
#define NDB_UPGRADE_STARTUP #define NDB_UPGRADE_STARTUP
class Ndbcntr;
struct UpgradeStartup { struct UpgradeStartup {
static void installEXEC(SimulatedBlock*); static void installEXEC(SimulatedBlock*);

3
ndb/include/ndb_global.h
View File

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

2
ndb/include/ndb_types.h
View File

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

1
ndb/include/ndbapi/Ndb.hpp
View File

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

2
ndb/include/ndbapi/NdbReceiver.hpp
View File

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

1
ndb/include/ndbapi/NdbScanOperation.hpp
View File

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

7
ndb/src/common/util/ConfigValues.cpp
View File

@ -1,9 +1,6 @@
#include <ndb_global.h>
#include <ConfigValues.hpp> #include <ConfigValues.hpp>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include <new>
#include <NdbOut.hpp> #include <NdbOut.hpp>
#include <NdbTCP.h> #include <NdbTCP.h>

2
ndb/src/kernel/blocks/backup/restore/Restore.hpp
View File

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

16
ndb/src/kernel/blocks/dbtup/Dbtup.hpp
View File

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

3
ndb/src/mgmsrv/SignalQueue.cpp
View File

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

2
ndb/tools/waiter.cpp
View File

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