diff options
| author | unknown <joreland@mysql.com> | 2004-08-18 11:18:56 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-08-18 11:18:56 +0200 |
| commit | bc5c7427c7d8342b04731d660390de163480ed4d (patch) | |
| tree | 39a02664e88cae248bf050a0f059c052bca765a9 /ndb/include | |
| parent | f03022b22a6850d74608be22e9748ed009545e61 (diff) | |
| parent | 74dc0adce57dc6c30c40dd80ffc3d97573f1d601 (diff) | |
| download | mariadb-git-bc5c7427c7d8342b04731d660390de163480ed4d.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/wl2025
BitKeeper/etc/logging_ok:
auto-union
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
Diffstat (limited to 'ndb/include')
| -rw-r--r-- | ndb/include/ndb_global.h | 4 | ||||
| -rw-r--r-- | ndb/include/ndbapi/Ndb.hpp | 19 |
2 files changed, 16 insertions, 7 deletions
diff --git a/ndb/include/ndb_global.h b/ndb/include/ndb_global.h index 2975d0a5f78..038950a7a32 100644 --- a/ndb/include/ndb_global.h +++ b/ndb/include/ndb_global.h @@ -3,9 +3,11 @@ #define NDBGLOBAL_H #include <my_global.h> - #define NDB_BASE_PORT 2200 +/** signal & SIG_PIPE */ +#include <my_alarm.h> + #if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32) #define NDB_WIN32 #else diff --git a/ndb/include/ndbapi/Ndb.hpp b/ndb/include/ndbapi/Ndb.hpp index 951c36bade1..76fc4dc407e 100644 --- a/ndb/include/ndbapi/Ndb.hpp +++ b/ndb/include/ndbapi/Ndb.hpp @@ -1414,12 +1414,19 @@ public: * * @return tuple id or 0 on error */ - Uint64 getAutoIncrementValue(const char* aTableName, Uint32 cacheSize = 1); - bool setAutoIncrementValue(const char* aTableName, Uint64 val, bool increase = false); - Uint64 getTupleIdFromNdb(const char* aTableName, Uint32 cacheSize = 1000 ); - Uint64 getTupleIdFromNdb(Uint32 aTableId, Uint32 cacheSize = 1000 ); - bool setTupleIdInNdb(const char* aTableName, Uint64 val, bool increase = false); - bool setTupleIdInNdb(Uint32 aTableId, Uint64 val, bool increase = false); + Uint64 getAutoIncrementValue(const char* aTableName, + Uint32 cacheSize = 1); + Uint64 readAutoIncrementValue(const char* aTableName); + bool setAutoIncrementValue(const char* aTableName, Uint64 val, + bool increase = false); + Uint64 getTupleIdFromNdb(const char* aTableName, + Uint32 cacheSize = 1000); + Uint64 getTupleIdFromNdb(Uint32 aTableId, + Uint32 cacheSize = 1000); + Uint64 readTupleIdFromNdb(Uint32 aTableId); + bool setTupleIdInNdb(const char* aTableName, Uint64 val, + bool increase); + bool setTupleIdInNdb(Uint32 aTableId, Uint64 val, bool increase); Uint64 opTupleIdOnNdb(Uint32 aTableId, Uint64 opValue, Uint32 op); #endif |