From: Jan Wedvik
Date: June 26 2009 12:16pm
Subject: bzr commit into mysql-5.1-telco-7.0-spj branch (jan.wedvik:2907)
List-Archive: http://lists.mysql.com/commits/77318
Message-Id: <20090626121625.8E032208@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4560293836413544056=="

--===============4560293836413544056==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home2/tmp/jw1159207/mysql/mysql-5.1-telco-7.0-spj/ based on revid:jan.wedvik@stripped

 2907 Jan Wedvik	2009-06-26 [merge]
      Preparing for merge.

    modified:
      storage/ndb/test/tools/test_spj.cpp
=== modified file 'storage/ndb/test/tools/test_spj.cpp'
--- a/storage/ndb/test/tools/test_spj.cpp	2009-06-26 10:17:49 +0000
+++ b/storage/ndb/test/tools/test_spj.cpp	2009-06-26 12:16:10 +0000
@@ -177,6 +177,79 @@ private:
   };
 };
 
+
+#ifdef UNUSED
+/**
+ * Append vestor of 16-bit words to vector of 32-bit words.
+ * adding a count as first 16-bit. 
+ * @return Number of 32-bit words appended.
+ */
+static
+Uint32
+appendCompactList(Vector<Uint32>& dst, const Vector<Uint32>& src)
+{
+  const Uint32 cnt = src.size();
+  if (cnt)
+  {
+    dst.push_back(cnt | (src[0] << 16));
+    for (Uint32 i = 1; i+1 < cnt; i += 2)
+    {
+      dst.push_back(src[i] | (src[i+1] << 16));
+    }
+    if ((cnt & 1) == 0)
+    {
+      dst.push_back(src[cnt-1] | (0xBABE << 16));
+    }
+    return 1+cnt/2
+  }
+
+  return 0;
+}
+
+#define POS_IN_QN(field) (offsetof(QN_LookupNode, field)/sizeof(Uint32)) 
+
+void serializeLookup(const NdbDictionary::Table& table
+		     Uint32 nodeNo,
+		     Uint32 flags,
+		     const Vector<Uint32>& parents,
+		     const Vector<Uint32>& childProj,
+		     bool userProjAll
+		     const Vector<Uint32>& userProj
+		     Vector<Uint32>& attrInfo){
+  assert(flags & DABits::NI_LINKED_ATTR ||
+	 childProj.size()==0);
+  assert((flags & DABits::NI_HAS_PARENT && 
+	  flags & DABits::NI_KEY_LINKED) ||
+	 parents.size()==0);
+  const int startPos = attrInfo.size();
+  attrInfo[startPos + POS_IN_QN(requestInfo)] = flags;
+  attrInfo[startPos + POS_IN_QN(tableId)] = table.getObjectId();
+  attrInfo[startPos + POS_IN_QN(tableVersion)] = table.getObjectVersion();
+  
+
+  int optPos = startPos POS_IN_QN(optional);
+
+  attrInfo[POS_IN_QN()] = ;
+
+
+
+  attrInfo[POS_IN_QN(len)] = kkkkk;
+  
+
+  struct SerializedLookup{
+    Vector<Uint32>& m_result;
+
+    explicit SerializedLookup(Vector<Uint32>& result):
+      m_result(result){}
+    
+    void setLength(Uint32 length){}
+    
+  };
+  QN_LookupNode queryNode;
+  
+}
+#endif
+
 LookupOp::LookupOp(const NdbOperation* pOp, 
 		   bool final, 
 		   int nodeNo){


--===============4560293836413544056==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/jan.wedvik@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jan.wedvik@stripped
# target_branch: file:///export/home2/tmp/jw1159207/mysql/mysql-5.1-\
#   telco-7.0-spj/
# testament_sha1: dee8bc805fdafdac593c298c8ec18299c296aa4f
# timestamp: 2009-06-26 14:16:25 +0200
# source_branch: bzr+ssh://jwedvik@stripped/bzrroot\
#   /server/mysql-5.1-telco-7.0-spj/
# base_revision_id: jan.wedvik@stripped
# 
# Begin bundle
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
IluY7ykTt7ikdjsl/4u5IpwoSBm22bUA


--===============4560293836413544056==--