mirror of
https://github.com/MariaDB/server.git
synced 2025-09-03 20:43:11 +03:00
ndb - bug#23499 and bug#23502
Fix some too small buffers in backup ndb/include/kernel/ndb_limits.h: backport for 5.1 add MAX_WORDS_META_FILE for computing Backup::NO_OF_PAGES_META_FILE ndb/src/kernel/blocks/backup/Backup.cpp: Make sure to set maxInsert so that we actually can handle NO_OF_META_PAGES ndb/src/kernel/blocks/backup/Backup.hpp: backport for 5.1 add MAX_WORDS_META_FILE for computing Backup::NO_OF_PAGES_META_FILE
This commit is contained in:
@@ -62,6 +62,8 @@
|
|||||||
#define MAX_KEY_SIZE_IN_WORDS 1023
|
#define MAX_KEY_SIZE_IN_WORDS 1023
|
||||||
#define MAX_FRM_DATA_SIZE 6000
|
#define MAX_FRM_DATA_SIZE 6000
|
||||||
|
|
||||||
|
#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
|
||||||
|
@@ -2323,9 +2323,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,
|
||||||
//25, // 100 bytes
|
4096, // 16k
|
||||||
4096, // 4k
|
|
||||||
16*3000, // Max 16 tuples
|
16*3000, // Max 16 tuples
|
||||||
};
|
};
|
||||||
Uint32 minWrite[] = {
|
Uint32 minWrite[] = {
|
||||||
|
@@ -513,7 +513,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
|
||||||
|
Reference in New Issue
Block a user