1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge perch.ndb.mysql.com:/home/jonas/src/41-work

Browse Source 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
This commit is contained in:
jonas@perch.ndb.mysql.com 2006-10-20 16:22:16 +02:00
commit 822e638d57
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ndb/include/kernel/ndb_limits.h
View File

@ -64,6 +64,8 @@
#define MAX_NULL_BITS 4096 #define MAX_NULL_BITS 4096
#define MAX_FRAGMENT_DATA_BYTES (4+(2 * 8 * MAX_REPLICAS * MAX_NDB_NODES)) #define MAX_FRAGMENT_DATA_BYTES (4+(2 * 8 * MAX_REPLICAS * MAX_NDB_NODES))
#define MAX_WORDS_META_FILE 24576
#define MIN_ATTRBUF ((MAX_ATTRIBUTES_IN_TABLE/24) + 1) #define MIN_ATTRBUF ((MAX_ATTRIBUTES_IN_TABLE/24) + 1)
/* /*
* Max Number of Records to fetch per SCAN_NEXTREQ in a scan in LQH. The * Max Number of Records to fetch per SCAN_NEXTREQ in a scan in LQH. The

4
ndb/src/kernel/blocks/backup/Backup.cpp
View File

@ -2535,8 +2535,8 @@ Backup::execDEFINE_BACKUP_REQ(Signal* signal)
0 // 3M 0 // 3M
}; };
const Uint32 maxInsert[] = { const Uint32 maxInsert[] = {
2048, // Temporarily to solve TR515 MAX_WORDS_META_FILE,
4096, // 4k 4096, // 16k
16*3000, // Max 16 tuples 16*3000, // Max 16 tuples
}; };
Uint32 minWrite[] = { Uint32 minWrite[] = {

4
ndb/src/kernel/blocks/backup/Backup.hpp
View File

@ -518,7 +518,9 @@ public:
Config c_defaults; Config c_defaults;
Uint32 m_diskless; Uint32 m_diskless;
STATIC_CONST(NO_OF_PAGES_META_FILE = 2); STATIC_CONST(NO_OF_PAGES_META_FILE =
(MAX_WORDS_META_FILE + BACKUP_WORDS_PER_PAGE - 1) /
BACKUP_WORDS_PER_PAGE);
/** /**
* Pools * Pools