summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorunknown <tomas@whalegate.ndb.mysql.com>2007-03-29 14:10:21 +0200
committerunknown <tomas@whalegate.ndb.mysql.com>2007-03-29 14:10:21 +0200
commit686842b9a3839b9270604a54d2835725f88f9dfd (patch)
treedad58c5696358d15a9b8fcd3336b75c15720a039 /storage
parentef003911af812d2228fd897f839e74877216c4a5 (diff)
downloadmariadb-git-686842b9a3839b9270604a54d2835725f88f9dfd.tar.gz
Bug #27512 Inconsistent tuples when using variable size and >16Gb datamemory
- also run this patch on 32 bit machines to allow online upgrade
Diffstat (limited to 'storage')
-rw-r--r--storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp b/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
index b96a7bf4fcb..2b723d745b2 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
@@ -1206,7 +1206,12 @@ typedef Ptr<HostBuffer> HostBufferPtr;
*/
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 );