diff options
| author | unknown <gni@dev3-221.dev.cn.tlan> | 2008-01-10 19:49:32 +0800 |
|---|---|---|
| committer | unknown <gni@dev3-221.dev.cn.tlan> | 2008-01-10 19:49:32 +0800 |
| commit | d8d857e0ccc63ffbe8c1a90994d51884d1ee46a0 (patch) | |
| tree | 63007427eb160d7aad0a35714150fb41708d748e /storage/ndb/include/kernel | |
| parent | 44ccc30b030863dde6a65ac380d5e5e85e32abf6 (diff) | |
| parent | 20764f80ae34eea5f4b05bf24ea2949b098d0054 (diff) | |
| download | mariadb-git-d8d857e0ccc63ffbe8c1a90994d51884d1ee46a0.tar.gz | |
Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/lgman.cpp:
Auto merged
storage/ndb/src/kernel/blocks/tsman.cpp:
Auto merged
storage/ndb/test/ndbapi/testDict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
SCCS merged
storage/ndb/src/ndbapi/ndberror.c:
SCCS merged
Diffstat (limited to 'storage/ndb/include/kernel')
| -rw-r--r-- | storage/ndb/include/kernel/ndb_limits.h | 11 | ||||
| -rw-r--r-- | storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/storage/ndb/include/kernel/ndb_limits.h b/storage/ndb/include/kernel/ndb_limits.h index 682f904d99a..9a9521e82ef 100644 --- a/storage/ndb/include/kernel/ndb_limits.h +++ b/storage/ndb/include/kernel/ndb_limits.h @@ -28,6 +28,17 @@ #define MAX_NODES 64 #define UNDEF_NODEGROUP 0xFFFF +/************************************************************************** + * IT SHOULD BE (MAX_NDB_NODES - 1). + * WHEN MAX_NDB_NODE IS CHANGED, IT SHOULD BE CHANGED ALSO + **************************************************************************/ +#define MAX_DATA_NODE_ID 48 +/************************************************************************** + * IT SHOULD BE (MAX_NODES - 1). + * WHEN MAX_NODES IS CHANGED, IT SHOULD BE CHANGED ALSO + **************************************************************************/ +#define MAX_NODES_ID 63 + /** * MAX_API_NODES = MAX_NODES - No of NDB Nodes in use */ diff --git a/storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp b/storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp index 6140e78cc5a..bbd3e818681 100644 --- a/storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp +++ b/storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp @@ -163,7 +163,8 @@ struct CreateFileImplRef { InvalidFileMetadata = 1510, OutOfMemory = 1511, FileReadError = 1512, - FilegroupNotOnline = 1513 + FilegroupNotOnline = 1513, + FileSizeTooLarge = 1515 }; Uint32 senderData; |