bk commit into 5.0 tree (jonas:1.2264)

[jonas]

Below is the list of changes that have just been committed into a local
5.0 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:22:16+02:00, jonas@stripped +3 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/41-work
  into  perch.ndb.mysql.com:/home/jonas/src/50-work
  MERGE: 1.1616.2144.203

  ndb/include/kernel/ndb_limits.h@stripped, 2006-10-20 16:21:48+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.10.1.1

  ndb/src/kernel/blocks/backup/Backup.cpp@stripped, 2006-10-20 16:22:14+02:00, jonas@stripped +0 -0
    SCCS merged
    MERGE: 1.11.1.14

  ndb/src/kernel/blocks/backup/Backup.hpp@stripped, 2006-10-20 16:21:48+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.6.1.4

# 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/50-work/RESYNC

--- 1.16/ndb/include/kernel/ndb_limits.h	2006-10-20 16:22:19 +02:00
+++ 1.17/ndb/include/kernel/ndb_limits.h	2006-10-20 16:22:19 +02:00
@@ -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

--- 1.34/ndb/src/kernel/blocks/backup/Backup.cpp	2006-10-20 16:22:19 +02:00
+++ 1.35/ndb/src/kernel/blocks/backup/Backup.cpp	2006-10-20 16:22:19 +02:00
@@ -2535,8 +2535,8 @@
     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[] = {

--- 1.13/ndb/src/kernel/blocks/backup/Backup.hpp	2006-10-20 16:22:19 +02:00
+++ 1.14/ndb/src/kernel/blocks/backup/Backup.hpp	2006-10-20 16:22:19 +02:00
@@ -518,8 +518,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
    */