Commit f4326d02 authored by unknown's avatar unknown
Browse files

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

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


storage/ndb/include/kernel/ndb_limits.h:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  merge
parents 53b1792e 65f50416

storage/ndb/include/kernel/ndb_limits.h

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ 
#define MAX_RANGE_DATA (131072+MAX_NDB_PARTITIONS) //0.5 MByte of list data

#define MAX_WORDS_META_FILE 16382



#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

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

+2 −2
Original line number Diff line number Diff line
@@ -2498,8 +2498,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[] = {

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

+3 −1
Original line number Diff line number Diff line
@@ -557,7 +557,9 @@ public: 
  NDB_TICKS m_reset_disk_speed_time;

  static const int  DISK_SPEED_CHECK_DELAY = 100;

  

  STATIC_CONST(NO_OF_PAGES_META_FILE = MAX_WORDS_META_FILE/BACKUP_WORDS_PER_PAGE);

  STATIC_CONST(NO_OF_PAGES_META_FILE =

               (MAX_WORDS_META_FILE + BACKUP_WORDS_PER_PAGE - 1) /

	       BACKUP_WORDS_PER_PAGE);



  /**

   * Pools