bk commit into 5.1 tree (joreland:1.1929)

[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.1929 05/07/06 14:58:31 joreland@stripped +3 -0
  ndb diskdata
    remove varsize keys from T* as restore can't handle them...

  storage/ndb/test/src/NDBT_Tables.cpp
    1.19 05/07/06 14:58:28 joreland@stripped +4 -4
    Remove varsize keys for now as restore can't handle them...

  storage/ndb/src/kernel/blocks/restore.cpp
    1.20 05/07/06 14:58:28 joreland@stripped +4 -3
    Fix for restore of var size keys
      (which works poorly anyway due to strnxfrm missing)

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.82 05/07/06 14:58:27 joreland@stripped +34 -2
    Improve #TRACE_LQHKEYREQ

# 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-ndb-dd

--- 1.19/storage/ndb/src/kernel/blocks/restore.cpp	2005-07-01 15:05:41 +02:00
+++ 1.20/storage/ndb/src/kernel/blocks/restore.cpp	2005-07-06 14:58:28 +02:00
@@ -980,17 +980,18 @@
     _align[0] = *it.data; ndbrequire(columns.next(it));
     _align[1] = *it.data;
 
+    Uint32 sz32 = (sz + 3) >> 2;
+
     if(c.m_flags & Column::COL_KEY)
     {
       assert(! c.m_nulloffset && c.m_flags & Column::COL_VAR);
-      memcpy(keyData, data, 4*sz);
-      keyData += c.m_size;
+      memcpy(keyData, data, sz);
+      keyData += sz32;
     }
 
     AttributeHeader::init(attrData++, c.m_id, sz);
     memcpy(attrData, data, sz);
 
-    Uint32 sz32 = (sz + 3) >> 2;
     attrData += sz32;
     data += sz32;
     //if (file_ptr.p->m_table_id >= 2) ndbout << "2: " << c.m_id << " " << sz << endl;

--- 1.81/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2005-06-13 15:24:49 +02:00
+++ 1.82/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2005-07-06 14:58:27 +02:00
@@ -3641,10 +3641,42 @@
 	   << ", " << refToNode(regTcPtr->clientBlockref) << ")"
 	   << " table=" << regTcPtr->tableref << " ";
     
+    ndbout << "hash: " << hex << regTcPtr->hashValue << endl;
+
     ndbout << "key=[" << hex;
-    for(Uint32 i = 0; i<regTcPtr->primKeyLen && i < 4; i++){
+    Uint32 i;
+    for(i = 0; i<regTcPtr->primKeyLen && i < 4; i++){
       ndbout << hex << regTcPtr->tupkeyData[i] << " ";
     }
+
+    DatabufPtr regDatabufptr;
+    regDatabufptr.i = regTcPtr->firstTupkeybuf;
+    while(i < regTcPtr->primKeyLen)
+    {
+      ptrCheckGuard(regDatabufptr, cdatabufFileSize, databuf);
+      for(Uint32 j = 0; j<4 && i<regTcPtr->primKeyLen; j++, i++)
+	ndbout << hex << regDatabufptr.p->data[j] << " ";
+    }
+    ndbout << "]" << endl;
+    
+    ndbout << "attr=[" << hex;
+    for(i = 0; i<regTcPtr->reclenAiLqhkey && i < 5; i++)
+      ndbout << hex << regTcPtr->firstAttrinfo[i] << " ";
+    
+    AttrbufPtr regAttrinbufptr;
+    regAttrinbufptr.i= regTcPtr->firstAttrinbuf;
+    while(i < regTcPtr->totReclenAi)
+    {
+      ptrCheckGuard(regAttrinbufptr, cattrinbufFileSize, attrbuf);
+      Uint32 dataLen = regAttrinbufptr.p->attrbuf[ZINBUF_DATA_LEN];
+      ndbrequire(dataLen != 0);
+      ndbrequire(i + dataLen <= regTcPtr->totReclenAi);
+      for(Uint32 j= 0; j<dataLen; j++, i++)
+	ndbout << hex << regAttrinbufptr.p->attrbuf[j] << " ";
+      
+      regAttrinbufptr.i = regAttrinbufptr.p->attrbuf[ZINBUF_NEXT];
+    }
+    
     ndbout << "]" << endl;
   }
 #endif
@@ -3942,7 +3974,7 @@
    * ----------------------------------------------------------------------- */
   Uint32 localKey2 = local_key & MAX_TUPLES_PER_PAGE;
   Uint32 localKey1 = local_key >> MAX_TUPLES_BITS;
-#if TRACE_LQHKEYREQ
+#ifdef TRACE_LQHKEYREQ
   ndbout << "localkey: [ " << hex << localKey1 << " " << localKey2 << "]" 
 	 << endl;
 #endif

--- 1.18/storage/ndb/test/src/NDBT_Tables.cpp	2005-07-05 06:27:29 +02:00
+++ 1.19/storage/ndb/test/src/NDBT_Tables.cpp	2005-07-06 14:58:28 +02:00
@@ -188,9 +188,9 @@
 const
 NDBT_Attribute T9Attribs[] = {
   NDBT_Attribute("KF_SKAPAD", NdbDictionary::Column::Unsigned, 1, true), 
-  NDBT_Attribute("PLATS_ID", NdbDictionary::Column::Varchar, 2, true),
+  NDBT_Attribute("PLATS_ID", NdbDictionary::Column::Char, 2, true),
   NDBT_Attribute("TNR_SKAPAD", NdbDictionary::Column::Char, 12, true),
-  NDBT_Attribute("DELG_MOT", NdbDictionary::Column::Varchar, 1, true),
+  NDBT_Attribute("DELG_MOT", NdbDictionary::Column::Char, 1, true),
   NDBT_Attribute("VALUE", NdbDictionary::Column::Unsigned),
 };
 static
@@ -261,9 +261,9 @@
 static
 const
 NDBT_Attribute T13Attribs[] = {
-  NDBT_Attribute("KOL1", NdbDictionary::Column::Longvarchar, 257, true), 
+  NDBT_Attribute("KOL1", NdbDictionary::Column::Char, 257, true), 
   NDBT_Attribute("KOL2", NdbDictionary::Column::Char, 259, true),
-  NDBT_Attribute("KOL3", NdbDictionary::Column::Varchar, 113, true),
+  NDBT_Attribute("KOL3", NdbDictionary::Column::Char, 113, true),
   NDBT_Attribute("KOL4", NdbDictionary::Column::Unsigned),
   NDBT_Attribute("KOL5", NdbDictionary::Column::Unsigned, 1, true),
   NDBT_Attribute("KOL6", NdbDictionary::Column::Unsigned),