summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpekka@mysql.com <>2005-05-07 11:18:45 +0200
committerpekka@mysql.com <>2005-05-07 11:18:45 +0200
commit8f150cc664bde86bbf6c1bca4f40cdbade8ce7ec (patch)
tree89c937f49a71a9ea2350e9ae30323112e9486522
parent7e7ed0f6a85918bf629eb11615318bb680315642 (diff)
parent8ccd11182fff3698e56cc59fed82f2c7c775f0b1 (diff)
downloadmariadb-git-8f150cc664bde86bbf6c1bca4f40cdbade8ce7ec.tar.gz
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
-rw-r--r--ndb/src/kernel/blocks/dbdict/Dbdict.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/ndb/src/kernel/blocks/dbdict/Dbdict.cpp b/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
index 184db794057..0c4d20ca248 100644
--- a/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
+++ b/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
@@ -4043,12 +4043,14 @@ calcLHbits(Uint32 * lhPageBits, Uint32 * lhDistrBits,
tmp <<= 1;
distrBits++;
}//while
+#ifdef ndb_classical_lhdistrbits
if (tmp != totalFragments) {
tmp >>= 1;
if ((fid >= (totalFragments - tmp)) && (fid < (tmp - 1))) {
distrBits--;
}//if
}//if
+#endif
* lhPageBits = pageBits;
* lhDistrBits = distrBits;