bk commit into 5.1 tree (joreland:1.1864)

[jonas.oreland]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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.1864 05/07/22 15:27:18 joreland@stripped +27 -0
  Merge joreland@stripped:/home/bk/mysql-5.1
  into  mysql.com:/home/jonas/src/mysql-5.1-push

  storage/ndb/tools/listTables.cpp
    1.23 05/07/22 15:27:09 joreland@stripped +0 -0
    Auto merged

  storage/ndb/tools/drop_index.cpp
    1.16 05/07/22 15:27:09 joreland@stripped +0 -0
    Auto merged

  storage/ndb/test/src/HugoOperations.cpp
    1.23 05/07/22 15:27:09 joreland@stripped +0 -0
    Auto merged

  storage/ndb/test/run-test/ndb-autotest.sh
    1.9 05/07/22 15:27:09 joreland@stripped +0 -0
    Auto merged

  storage/ndb/test/run-test/daily-basic-tests.txt
    1.34 05/07/22 15:27:09 joreland@stripped +0 -0
    Auto merged

  storage/ndb/test/ndbapi/testNdbApi.cpp
    1.20 05/07/22 15:27:09 joreland@stripped +0 -0
    Auto merged

  storage/ndb/test/ndbapi/testBlobs.cpp
    1.28 05/07/22 15:27:09 joreland@stripped +0 -0
    Auto merged

  storage/ndb/test/ndbapi/testBackup.cpp
    1.14 05/07/22 15:27:09 joreland@stripped +0 -0
    Auto merged

  storage/ndb/test/include/HugoOperations.hpp
    1.15 05/07/22 15:27:09 joreland@stripped +0 -0
    Auto merged

  storage/ndb/src/ndbapi/ndberror.c
    1.38 05/07/22 15:27:09 joreland@stripped +0 -0
    Auto merged

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.88 05/07/22 15:27:09 joreland@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
    1.19 05/07/22 15:27:09 joreland@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp
    1.7 05/07/22 15:27:09 joreland@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp
    1.4 05/07/22 15:27:09 joreland@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp
    1.6 05/07/22 15:27:09 joreland@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
    1.20 05/07/22 15:27:09 joreland@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.73 05/07/22 15:27:08 joreland@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.32 05/07/22 15:27:08 joreland@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
    1.16 05/07/22 15:27:07 joreland@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.50 05/07/22 15:27:07 joreland@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
    1.56 05/07/22 15:27:07 joreland@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/backup/Backup.cpp
    1.21 05/07/22 15:27:07 joreland@stripped +0 -0
    Auto merged

  storage/ndb/include/ndbapi/NdbDictionary.hpp
    1.53 05/07/22 15:27:07 joreland@stripped +0 -0
    Auto merged

  storage/ndb/include/kernel/signaldata/DropTable.hpp
    1.4 05/07/22 15:27:07 joreland@stripped +0 -0
    Auto merged

  storage/ndb/include/kernel/signaldata/DictTabInfo.hpp
    1.21 05/07/22 15:27:07 joreland@stripped +0 -0
    Auto merged

  storage/ndb/include/kernel/signaldata/AlterTable.hpp
    1.4 05/07/22 15:27:07 joreland@stripped +0 -0
    Auto merged

  sql/ha_ndbcluster.cc
    1.201 05/07/22 15:27:06 joreland@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:	joreland
# Host:	eel.(none)
# Root:	/home/jonas/src/mysql-5.1-push/RESYNC

--- 1.31/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2005-07-20 13:44:48 +02:00
+++ 1.32/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2005-07-22 15:27:08 +02:00
@@ -6220,6 +6220,17 @@
           noOfFragments = 1;
           set_default_node_groups(signal, noOfFragments);
           break;
+        case DictTabInfo::DistrKeyHash:
+          jam();
+        case DictTabInfo::DistrKeyLin:
+          jam();
+          if (noOfFragments == 0)
+          {
+            jam();
+            noOfFragments = csystemnodes;
+            set_default_node_groups(signal, noOfFragments);
+          }
+          break;
         default:
           jam();
           if (noOfFragments == 0)

--- 1.87/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2005-07-20 13:44:49 +02:00
+++ 1.88/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2005-07-22 15:27:09 +02:00
@@ -505,19 +505,35 @@
 Uint32
 NdbTableImpl::get_nodes(Uint32 hashValue, const Uint16 ** nodes) const
 {
-  if(m_replicaCount > 0)
+  Uint32 fragmentId;
+  if(m_replicaCount == 0)
+    return 0;
+  switch (m_fragmentType)
   {
-    Uint32 fragmentId = hashValue & m_hashValueMask;
-    if(fragmentId < m_hashpointerValue) 
+    case NdbDictionary::Object::FragAllSmall:
+    case NdbDictionary::Object::FragAllMedium:
+    case NdbDictionary::Object::FragAllLarge:
+    case NdbDictionary::Object::FragSingle:
+    case NdbDictionary::Object::DistrKeyLin:
     {
-      fragmentId = hashValue & ((m_hashValueMask << 1) + 1);
+      fragmentId = hashValue & m_hashValueMask;
+      if(fragmentId < m_hashpointerValue) 
+        fragmentId = hashValue & ((m_hashValueMask << 1) + 1);
+      break;
     }
-    Uint32 pos = fragmentId * m_replicaCount;
-    if(pos + m_replicaCount <= m_fragments.size())
+    case NdbDictionary::Object::DistrKeyHash:
     {
-      * nodes = m_fragments.getBase()+pos;
-      return m_replicaCount;
+      fragmentId = hashValue % m_fragmentCount;
+      break;
     }
+    default:
+      return 0;
+  }
+  Uint32 pos = fragmentId * m_replicaCount;
+  if (pos + m_replicaCount <= m_fragments.size())
+  {
+    *nodes = m_fragments.getBase()+pos;
+    return m_replicaCount;
   }
   return 0;
 }