bzr commit into mysql-5.1-telco-6.3 branch (tomas.ulin:2630)

[Tomas Ulin]

#At file:///home/tomas/mysql_src/cge-6.3/

 2630 Tomas Ulin	2008-06-18 [merge]
      merge
modified:
  storage/ndb/include/kernel/ndb_limits.h
  storage/ndb/include/ndb_version.h.in
  storage/ndb/src/kernel/vm/TransporterCallback.cpp

=== modified file 'storage/ndb/include/kernel/ndb_limits.h'
--- a/storage/ndb/include/kernel/ndb_limits.h	2008-03-03 11:12:37 +0000
+++ b/storage/ndb/include/kernel/ndb_limits.h	2008-06-18 08:54:23 +0000
@@ -171,4 +171,12 @@
  */
 #define LCP_RESTORE_BUFFER (4*32)
 
+/**
+ * Bits/mask used for coding/decoding blockno/blockinstance
+ */
+#define NDBMT_BLOCK_BITS 9
+#define NDBMT_BLOCK_MASK 0x001FF
+#define NDBMT_BLOCK_INSTANCES_BITS 7
+#define NDBMT_BLOCK_INSTANCE_MASK 0xFE00
+
 #endif

=== modified file 'storage/ndb/include/ndb_version.h.in'
--- a/storage/ndb/include/ndb_version.h.in	2008-05-16 13:10:18 +0000
+++ b/storage/ndb/include/ndb_version.h.in	2008-06-18 08:54:23 +0000
@@ -225,4 +225,6 @@ ndbd_LIST_TABLES_CONF_long_signal(Uint32
   return x >= NDBD_LONG_LIST_TABLES_CONF_63;
 }
 
+#define NDBD_FILTER_INSTANCE_63 NDB_MAKE_VERSION(6,3,16)
+
 #endif

=== modified file 'storage/ndb/src/kernel/vm/TransporterCallback.cpp'
--- a/storage/ndb/src/kernel/vm/TransporterCallback.cpp	2006-12-23 19:20:40 +0000
+++ b/storage/ndb/src/kernel/vm/TransporterCallback.cpp	2008-06-18 08:59:57 +0000
@@ -222,6 +222,7 @@ execute(void * callbackObj, 
 
   const Uint32 secCount = header->m_noOfSections;
   const Uint32 length = header->theLength;
+  header->theReceiversBlockNumber &= NDBMT_BLOCK_MASK;
 
 #ifdef TRACE_DISTRIBUTED
   ndbout_c("recv: %s(%d) from (%s, %d)",