diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2006-03-09 11:16:09 +0100 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2006-03-09 11:16:09 +0100 |
| commit | c0031f83d240620cc6af169ae851d1564557cb1e (patch) | |
| tree | 341d47fa27c511e6d439518f4fb4508ccfa2f45c /storage/ndb/include/kernel | |
| parent | 2a1ef746f574b59552099e887edfeb0c8422fa57 (diff) | |
| parent | 6e92c5ee4cb6d5b4946562a7cefe6a0df79360bb (diff) | |
| download | mariadb-git-c0031f83d240620cc6af169ae851d1564557cb1e.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/51-ndb
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
Diffstat (limited to 'storage/ndb/include/kernel')
| -rw-r--r-- | storage/ndb/include/kernel/ndb_limits.h | 6 | ||||
| -rw-r--r-- | storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/storage/ndb/include/kernel/ndb_limits.h b/storage/ndb/include/kernel/ndb_limits.h index 6bf9256bf95..5985fbe5d9b 100644 --- a/storage/ndb/include/kernel/ndb_limits.h +++ b/storage/ndb/include/kernel/ndb_limits.h @@ -150,10 +150,4 @@ */ #define LCP_RESTORE_BUFFER (4*32) -/* - * Log buffer pages - * 8M - */ -#define LGMAN_LOG_BUFFER (8*32) - #endif diff --git a/storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp b/storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp index c2825a77b21..7b50bcf2d49 100644 --- a/storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp +++ b/storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp @@ -60,9 +60,10 @@ public: fsFormatArrayOfPages=1, fsFormatListOfMemPages=2, fsFormatGlobalPage=3, + fsFormatSharedPage=4, fsFormatMax }; - + /** * Length of signal */ |