Commit 65f50416 authored by unknown's avatar unknown
Browse files

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

into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/include/kernel/ndb_limits.h:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  SCCS merged
parents c54295f7 9070859e

ndb/include/kernel/ndb_limits.h

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ 
#define MAX_NULL_BITS 4096

#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)

/*

 * Max Number of Records to fetch per SCAN_NEXTREQ in a scan in LQH. The

ndb/src/kernel/blocks/backup/Backup.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2535,8 +2535,8 @@ Backup::execDEFINE_BACKUP_REQ(Signal* signal) 
    0    // 3M

  };

  const Uint32 maxInsert[] = {

    2048,  // Temporarily to solve TR515

    4096,    // 4k

    MAX_WORDS_META_FILE,

    4096,    // 16k

    16*3000, // Max 16 tuples

  };

  Uint32 minWrite[] = {

ndb/src/kernel/blocks/backup/Backup.hpp

+4 −2
Original line number Diff line number Diff line
@@ -518,7 +518,9 @@ public: 
  Config c_defaults;

  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