bk commit into 5.1 tree (tomas:1.2450) BUG#27512

[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@stripped, 2007-03-29 14:10:21+02:00, tomas@stripped +1 -0
  Bug #27512 Inconsistent tuples when using variable size and >16Gb datamemory
  - also run this patch on 32 bit machines to allow online upgrade

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@stripped, 2007-03-29 14:10:19+02:00,
tomas@stripped +6 -1
    Bug #27512 Inconsistent tuples when using variable size and >16Gb datamemory
    - also run this patch on 32 bit machines to allow online upgrade

# 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:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-telco-gca

--- 1.56/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2007-03-29 11:05:30 +02:00
+++ 1.57/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2007-03-29 14:10:19 +02:00
@@ -1206,7 +1206,12 @@
    */
   struct Var_part_ref 
   {
-#if NDB_SIZEOF_CHARP == 4
+#ifdef NDB_32BIT_VAR_REF
+    /*
+      In versions prior to ndb 6.1.6, 6.2.1 and mysql 5.1.17
+      Running this code limits DataMemory to 16G, also online
+      upgrade not possible between versions
+     */
     Uint32 m_ref;
     STATIC_CONST( SZ32 = 1 );