bk commit into 4.1 tree (jonas:1.2555) BUG#23502

[jonas]

Below is the list of changes that have just been committed into a local
4.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-10-20 16:16:01+02:00, jonas@stripped +3 -0
  ndb - bug#23499 and bug#23502
    Fix some too small buffers in backup
    

  ndb/include/kernel/ndb_limits.h@stripped, 2006-10-20 16:15:59+02:00,
jonas@stripped +2 -0
    backport for 5.1
    add MAX_WORDS_META_FILE for computing Backup::NO_OF_PAGES_META_FILE

  ndb/src/kernel/blocks/backup/Backup.cpp@stripped, 2006-10-20 16:16:00+02:00,
jonas@stripped +2 -3
    Make sure to set maxInsert so that we actually can handle NO_OF_META_PAGES

  ndb/src/kernel/blocks/backup/Backup.hpp@stripped, 2006-10-20 16:16:00+02:00,
jonas@stripped +4 -2
    backport for 5.1
    add MAX_WORDS_META_FILE for computing Backup::NO_OF_PAGES_META_FILE

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/41-work

--- 1.10/ndb/include/kernel/ndb_limits.h	2006-10-20 16:16:03 +02:00
+++ 1.11/ndb/include/kernel/ndb_limits.h	2006-10-20 16:16:03 +02:00
@@ -62,6 +62,8 @@
 #define MAX_KEY_SIZE_IN_WORDS 1023
 #define MAX_FRM_DATA_SIZE 6000
 
+#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

--- 1.24/ndb/src/kernel/blocks/backup/Backup.cpp	2006-10-20 16:16:03 +02:00
+++ 1.25/ndb/src/kernel/blocks/backup/Backup.cpp	2006-10-20 16:16:03 +02:00
@@ -2323,9 +2323,8 @@
     0    // 3M
   };
   const Uint32 maxInsert[] = {
-    2048,  // Temporarily to solve TR515
-    //25,      // 100 bytes
-    4096,    // 4k
+    MAX_WORDS_META_FILE,
+    4096,    // 16k
     16*3000, // Max 16 tuples
   };
   Uint32 minWrite[] = {

--- 1.9/ndb/src/kernel/blocks/backup/Backup.hpp	2006-10-20 16:16:03 +02:00
+++ 1.10/ndb/src/kernel/blocks/backup/Backup.hpp	2006-10-20 16:16:03 +02:00
@@ -513,8 +513,10 @@
   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
    */