From: Date: March 13 2006 1:37pm
Subject: bk commit into 5.1 tree (jonas:1.2168) BUG#18026
List-Archive: http://lists.mysql.com/commits/3772
X-Bug: 18026
Message-Id: <20060313123748.291BE2FBC10@perch.ndb.mysql.com>

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.2168 06/03/13 13:37:42 jonas@stripped +2 -0
  ndb - bug#18026
    incorrect handling of varsize primary key and charsets in tup-scan

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
    1.12 06/03/13 13:37:39 jonas@stripped +1 -1
    PK needs to be normalized before computing hashvalue, otherwise lock-req will not find row,
      causing assertion in debug build, and inconsistency in release

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.99 06/03/13 13:37:39 jonas@stripped +9 -2
    put tracenr log in signal log instead...as out file gets very big...

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-new

--- 1.98/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-03-13 12:29:40 +01:00
+++ 1.99/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-03-13 13:37:39 +01:00
@@ -119,9 +119,10 @@
 const Uint32 NR_ScanNo = 0;
 
 #if defined VM_TRACE || defined ERROR_INSERT || defined NDBD_TRACENR
-NdbOut & tracenrout = ndbout;
+#include <NdbConfig.h>
+NdbOut * tracenrout = 0;
 static int TRACENR_FLAG = 0;
-#define TRACENR(x) tracenrout << x
+#define TRACENR(x) (* tracenrout) << x
 #define SET_TRACENR_FLAG TRACENR_FLAG = 1
 #define CLEAR_TRACENR_FLAG TRACENR_FLAG = 0
 #else
@@ -445,6 +446,12 @@
     c_acc = (Dbacc*)globalData.getBlock(DBACC);
     ndbrequire(c_tup != 0 && c_acc != 0);
     sendsttorryLab(signal);
+    
+#if defined VM_TRACE || defined ERROR_INSERT || defined NDBD_TRACENR
+    char *name = NdbConfig_SignalLogFileName(getOwnNodeId());
+    tracenrout = new NdbOut(* new FileOutputStream(fopen(name, "w+")));
+#endif
+    
     return;
     break;
   case 4:

--- 1.11/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp	2006-03-02 16:44:09 +01:00
+++ 1.12/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp	2006-03-13 13:37:39 +01:00
@@ -280,7 +280,7 @@
       const ScanPos& pos = scan.m_scanPos;
       const Local_key& key_mm = pos.m_key_mm;
       int ret = tuxReadPk(fragPtr.i, pos.m_realpid_mm, key_mm.m_page_idx,
-			  pkData, false);
+			  pkData, true);
       ndbrequire(ret > 0);
       pkSize = ret;
       dbg((DBTUP, "PK size=%d data=%08x", pkSize, pkData[0]));