bk commit into 5.1 tree (pekka:1.2337) BUG#21690

[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@stripped, 2006-12-01 02:06:37+01:00, pekka@stripped +2 -0
  ndb - bug#21690: fix typo which changed blob parts distribution

  storage/ndb/src/ndbapi/NdbBlob.cpp@stripped, 2006-12-01 01:59:04+01:00,
pekka@stripped +0 -6
    fix typo which made blob PART part of distribution key

  storage/ndb/src/ndbapi/NdbDictionary.cpp@stripped, 2006-12-01 01:59:04+01:00,
pekka@stripped +1 -1
    fix typo which made blob PART part of distribution key

# 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:	orca.ndb.mysql.com
# Root:	/export/home/space/pekka/ndb/version/my51-bug21690

--- 1.64/storage/ndb/src/ndbapi/NdbDictionary.cpp	2006-12-01 02:06:58 +01:00
+++ 1.65/storage/ndb/src/ndbapi/NdbDictionary.cpp	2006-12-01 02:06:58 +01:00
@@ -204,7 +204,7 @@
 
 void 
 NdbDictionary::Column::setPartitionKey(bool val){
-  m_impl.m_distributionKey = true;
+  m_impl.m_distributionKey = val;
 }
 
 bool 

--- 1.48/storage/ndb/src/ndbapi/NdbBlob.cpp	2006-12-01 02:06:58 +01:00
+++ 1.49/storage/ndb/src/ndbapi/NdbBlob.cpp	2006-12-01 02:06:58 +01:00
@@ -164,12 +164,6 @@
     bc.setStorageType(c->getStorageType());
     bt.addColumn(bc);
   }
-  // temp fix for bug#21690 - distr key set wrong
-  { unsigned x;
-    bt.getColumn(x=0)->setDistributionKey(true);
-    bt.getColumn(x=1)->setDistributionKey(true);
-    bt.getColumn(x=2)->setDistributionKey(false);
-  }
   DBUG_VOID_RETURN;
 }