bk commit into 5.1 tree (pekka:1.1912)

[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

  storage/ndb/test/ndbapi/testOIBasic.cpp
    1.47 05/06/18 22:06:28 pekka@stripped +4 -6
    enable varsize hash keys

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.88 05/06/18 22:06:28 pekka@stripped +1 -1
    enable varsize hash keys

  storage/ndb/src/common/util/NdbSqlUtil.cpp
    1.32 05/06/18 22:06:28 pekka@stripped +2 -2
    enable varsize hash keys

ChangeSet
  1.1912 05/06/18 21:52:37 pekka@stripped +3 -0
  ndb - wl#1751 enable varsize hash keys (more fixes to come)

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

--- 1.31/storage/ndb/src/common/util/NdbSqlUtil.cpp	2005-04-29 16:30:22 +02:00
+++ 1.32/storage/ndb/src/common/util/NdbSqlUtil.cpp	2005-06-18 22:06:28 +02:00
@@ -878,6 +878,8 @@
   const Type& type = getType(typeId);
   switch (type.m_typeId) {
   case Type::Char:
+  case Type::Varchar:
+  case Type::Longvarchar:
     {
       const CHARSET_INFO *cs = (const CHARSET_INFO*)info;
       return
@@ -888,8 +890,6 @@
         cs->strxfrm_multiply <= MAX_XFRM_MULTIPLY;
     }
     break;
-  case Type::Varchar:
-  case Type::Longvarchar:
   case Type::Undefined:
   case Type::Blob:
   case Type::Text:

--- 1.87/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2005-06-17 18:22:02 +02:00
+++ 1.88/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2005-06-18 22:06:28 +02:00
@@ -1794,7 +1794,7 @@
     tmpAttr.AttributeExtPrecision = ((unsigned)col->m_precision & 0xFFFF);
     tmpAttr.AttributeExtScale = col->m_scale;
     tmpAttr.AttributeExtLength = col->m_length;
-    if(col->m_pk || col->m_storageType == NDB_STORAGETYPE_DISK)
+    if(col->m_storageType == NDB_STORAGETYPE_DISK)
       tmpAttr.AttributeArrayType = NDB_ARRAYTYPE_FIXED;
     else
       tmpAttr.AttributeArrayType = col->m_arrayType;

--- 1.46/storage/ndb/test/ndbapi/testOIBasic.cpp	2005-06-13 15:24:54 +02:00
+++ 1.47/storage/ndb/test/ndbapi/testOIBasic.cpp	2005-06-18 22:06:28 +02:00
@@ -1114,11 +1114,10 @@
     }
     if (useindex(par, 5)) {
       // b, c, d
-      ITab* x = new ITab(*t, "ti1z5", ITab::UniqueHashIndex, 2);
+      ITab* x = new ITab(*t, "ti1z5", ITab::UniqueHashIndex, 3);
       x->icoladd(0, new ICol(*x, 0, *t->m_col[1]));
       x->icoladd(1, new ICol(*x, 1, *t->m_col[2]));
-      /** Hash index is currently not supported on var size columns */
-      //x->icoladd(2, new ICol(*x, 2, *t->m_col[3]));
+      x->icoladd(2, new ICol(*x, 2, *t->m_col[3]));
       t->itabadd(5, x);
     }
     tablist[1] = t;
@@ -1130,7 +1129,7 @@
     t->coladd(0, new Col(*t, 0, "a", 1, Col::Char, 31, 0, getcs(par)));
     t->coladd(1, new Col(*t, 1, "b", 0, Col::Char, 4, 1, getcs(par)));
     t->coladd(2, new Col(*t, 2, "c", 1, Col::Unsigned, 1, 0, 0));
-    t->coladd(3, new Col(*t, 3, "d", 0, Col::Varchar, 128, 0, getcs(par)));
+    t->coladd(3, new Col(*t, 3, "d", 1, Col::Varchar, 128, 0, getcs(par)));
     t->coladd(4, new Col(*t, 4, "e", 0, Col::Varchar, 7, 0, getcs(par)));
     if (useindex(par, 0)) {
       // a, c, d
@@ -1169,8 +1168,7 @@
       x->icoladd(1, new ICol(*x, 1, *t->m_col[2]));
       t->itabadd(4, x);
     }
-    if (false && useindex(par, 5)) {
-      /** Hash index is currently not supported on var size */
+    if (useindex(par, 5)) {
       // a, c, d, e
       ITab* x = new ITab(*t, "ti2z5", ITab::UniqueHashIndex, 4);
       x->icoladd(0, new ICol(*x, 0, *t->m_col[0]));