bk commit into 5.1 tree (tulin:1.1946)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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.1946 05/06/08 14:55:36 tulin@stripped +1 -0
  NdbDictionaryImpl.cpp:
    enable distributio/partition key for binary collations

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.93 05/06/08 14:54:32 ndbdev@stripped +8 -2
    enable distributio/partition key for binary collations

# 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:	tulin
# Host:	dl145b.mysql.com
# Root:	/home/ndbdev/tomas/mysql-5.1-wl2325

--- 1.92/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	Tue Jun  7 14:44:42 2005
+++ 1.93/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	Wed Jun  8 14:54:32 2005
@@ -1710,8 +1710,14 @@
     }
     // distribution key not supported for Char attribute
     if (distKeys && col->m_distributionKey && col->m_cs != NULL) {
-      m_error.code= 745;
-      DBUG_RETURN(-1);
+      // we can allow this for non-var char where strxfrm does nothing
+      if (col->m_type == NdbDictionary::Column::Char &&
+          (col->m_cs->state & MY_CS_BINSORT))
+        ;
+      else {
+        m_error.code= 745;
+        DBUG_RETURN(-1);
+      }
     }
     // charset in upper half of precision
     if (col->getCharType()) {