Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb

into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb

storage/ndb/src/ndbapi/NdbBlob.cpp

@@ -164,6 +164,12 @@ NdbBlob::getBlobTable(NdbTableImpl& bt, const NdbTableImpl* t, const NdbColumnIm
     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;
 }