bk commit into 5.1 tree (mskold:1.1887)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty 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.1887 05/09/15 10:09:15 mskold@stripped +2 -0
  Merge mskold@stripped:/home/bk/mysql-5.1
  into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-opt

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.93 05/09/15 10:09:06 mskold@stripped +0 -0
    Auto merged

  storage/ndb/src/ndbapi/NdbDictionary.cpp
    1.40 05/09/15 10:09:06 mskold@stripped +0 -0
    Auto merged

# 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:	mskold
# Host:	blowfish.ndb.mysql.com
# Root:	/usr/local/home/marty/MySQL/mysql-5.1-opt/RESYNC

--- 1.39/storage/ndb/src/ndbapi/NdbDictionary.cpp	2005-09-13 13:19:04 +02:00
+++ 1.40/storage/ndb/src/ndbapi/NdbDictionary.cpp	2005-09-15 10:09:06 +02:00
@@ -1070,3 +1070,4 @@
 const NdbDictionary::Column * NdbDictionary::Column::COMMIT_COUNT = 0;
 const NdbDictionary::Column * NdbDictionary::Column::ROW_SIZE = 0;
 const NdbDictionary::Column * NdbDictionary::Column::RANGE_NO = 0;
+const NdbDictionary::Column * NdbDictionary::Column::RECORDS_IN_RANGE = 0;

--- 1.92/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2005-09-14 12:46:43 +02:00
+++ 1.93/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2005-09-15 10:09:06 +02:00
@@ -266,6 +266,11 @@
     col->m_impl.m_attrId = AttributeHeader::RANGE_NO;
     col->m_impl.m_attrSize = 4;
     col->m_impl.m_arraySize = 1;
+  } else if(!strcmp(name, "NDB$RECORDS_IN_RANGE")){
+    col->setType(NdbDictionary::Column::Unsigned);
+    col->m_impl.m_attrId = AttributeHeader::RECORDS_IN_RANGE;
+    col->m_impl.m_attrSize = 4;
+    col->m_impl.m_arraySize = 4;
   } else {
     abort();
   }
@@ -763,12 +768,14 @@
       delete NdbDictionary::Column::COMMIT_COUNT;
       delete NdbDictionary::Column::ROW_SIZE;
       delete NdbDictionary::Column::RANGE_NO;
+      delete NdbDictionary::Column::RECORDS_IN_RANGE;
       NdbDictionary::Column::FRAGMENT= 0;
       NdbDictionary::Column::FRAGMENT_MEMORY= 0;
       NdbDictionary::Column::ROW_COUNT= 0;
       NdbDictionary::Column::COMMIT_COUNT= 0;
       NdbDictionary::Column::ROW_SIZE= 0;
       NdbDictionary::Column::RANGE_NO= 0;
+      NdbDictionary::Column::RECORDS_IN_RANGE= 0;
     }
     m_globalHash->unlock();
   } else {
@@ -841,6 +848,8 @@
 	NdbColumnImpl::create_pseudo("NDB$ROW_SIZE");
       NdbDictionary::Column::RANGE_NO= 
 	NdbColumnImpl::create_pseudo("NDB$RANGE_NO");
+      NdbDictionary::Column::RECORDS_IN_RANGE= 
+	NdbColumnImpl::create_pseudo("NDB$RECORDS_IN_RANGE");
     }
     m_globalHash->unlock();
     return true;
@@ -2215,6 +2224,7 @@
   }
 
   * dst = idx;
+
   return 0;
 }
 
@@ -3249,4 +3259,3 @@
 template class Vector<Vector<Uint32> >;
 template class Vector<NdbTableImpl*>;
 template class Vector<NdbColumnImpl*>;
-