bk commit into 5.1 tree (tomas:1.2223) BUG#19852

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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
  1.2223 06/06/27 13:40:33 tomas@stripped +1 -0
  Bug #19852 Restoring backup made from cluster with full data memory fails
  - post merge fixes for 5.1

  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
    1.29 06/06/27 13:40:27 tomas@stripped +5 -3
    Bug #19852 Restoring backup made from cluster with full data memory fails
    - post merge fixes for 5.1

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new-ndb

--- 1.28/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp	2006-06-27 13:12:24 +02:00
+++ 1.29/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp	2006-06-27 13:40:27 +02:00
@@ -535,9 +535,11 @@
 #endif
   
   {
-    ndbrequire(regTabPtr.p->m_offsets[MM].m_fix_header_size > 0);
-    Uint32 noRowsPerPage =
-      ZWORDS_ON_PAGE/regTabPtr.p->m_offsets[MM].m_fix_header_size;
+    Uint32 fix_tupheader = regTabPtr.p->m_offsets[MM].m_fix_header_size;
+    if(regTabPtr.p->m_attributes[MM].m_no_of_varsize != 0)
+      fix_tupheader += Tuple_header::HeaderSize + 1;
+    ndbassert(fix_tupheader > 0);
+    Uint32 noRowsPerPage = ZWORDS_ON_PAGE / fix_tupheader;
     Uint32 noAllocatedPages =
       (fragOperPtr.p->minRows + noRowsPerPage - 1 )/ noRowsPerPage;
     if (fragOperPtr.p->minRows == 0)