bk commit into 5.1 tree (pekka:1.1932)

[pekka]

Below is the list of changes that have just been committed into a local
5.1 repository of pekka. When pekka 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.1932 05/07/07 01:19:51 pekka@stripped +3 -0
  ndb - 5.1 no-reshuffle

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.89 05/07/07 01:18:54 pekka@stripped +2 -12
    no-reshuffle

  storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
    1.23 05/07/07 01:18:54 pekka@stripped +1 -1
    no-reshuffle

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.85 05/07/07 01:18:54 pekka@stripped +1 -1
    no-reshuffle

# 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:	pekka
# Host:	clam.ndb.mysql.com
# Root:	/export/space/pekka/ndb/version/my51-vs

--- 1.84/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2005-07-06 14:52:55 +02:00
+++ 1.85/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2005-07-07 01:18:54 +02:00
@@ -7273,7 +7273,7 @@
       w.add(DictTabInfo::AttributeName, attributeName);
       Uint32 attrType = AttributeDescriptor::getType(a);
       // computed
-      w.add(DictTabInfo::AttributeId, ZNIL);
+      w.add(DictTabInfo::AttributeId, k);
       if (indexPtr.p->isHashIndex()) {
         w.add(DictTabInfo::AttributeKeyFlag, (Uint32)true);
         w.add(DictTabInfo::AttributeNullableFlag, (Uint32)false);

--- 1.22/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp	2005-06-17 18:22:02 +02:00
+++ 1.23/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp	2005-07-07 01:18:54 +02:00
@@ -1578,7 +1578,7 @@
     const SysColumn& column = table.columnList[i];
     ndbassert(column.pos == i);
     w.add(DictTabInfo::AttributeName, column.name);
-    w.add(DictTabInfo::AttributeId, (Uint32)ZNIL);
+    w.add(DictTabInfo::AttributeId, (Uint32)i);
     w.add(DictTabInfo::AttributeKeyFlag, (Uint32)column.keyFlag);
     w.add(DictTabInfo::AttributeStorageType, 
 	  (Uint32)NDB_STORAGETYPE_MEMORY);

--- 1.88/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2005-06-18 22:06:28 +02:00
+++ 1.89/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2005-07-07 01:18:54 +02:00
@@ -518,16 +518,7 @@
   for (i = 0, n = m_noOfKeys; n != 0; i++) {
     NdbColumnImpl* col = m_columns[i];
     if (col->m_pk) {
-      if (col->m_arrayType == NDB_ARRAYTYPE_FIXED)
-        col->m_keyInfoPos = keyInfoPos++;
-      n--;
-    }
-  }
-  for (i = 0, n = m_noOfKeys; n != 0; i++) {
-    NdbColumnImpl* col = m_columns[i];
-    if (col->m_pk) {
-      if (col->m_arrayType != NDB_ARRAYTYPE_FIXED)
-        col->m_keyInfoPos = keyInfoPos++;
+      col->m_keyInfoPos = keyInfoPos++;
       n--;
     }
   }
@@ -1784,8 +1775,7 @@
     DictTabInfo::Attribute tmpAttr; tmpAttr.init();
     BaseString::snprintf(tmpAttr.AttributeName, sizeof(tmpAttr.AttributeName), 
 	     col->m_name.c_str());
-    // pass internal attribute id as ZNIL if not known (create table)
-    tmpAttr.AttributeId = col->m_attrId == -1 ? 0xFFFF : col->m_attrId;
+    tmpAttr.AttributeId = col->m_attrId;
     tmpAttr.AttributeKeyFlag = col->m_pk;
     tmpAttr.AttributeNullableFlag = col->m_nullable;
     tmpAttr.AttributeDKey = distKeys ? (bool)col->m_distributionKey : 0;