From: Date: July 23 2008 1:25pm
Subject: bzr commit into mysql-5.1-telco-6.3 tree (frazer:2641) Bug#38204
List-Archive: http://lists.mysql.com/commits/50297
X-Bug: 38204
Message-Id: <200807231125.m6NBPUpV008772@forth.ndb.mysql.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1657765351=="

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

#At file:///home/frazer/bzr/mysql-5.1-telco-6.3/

------------------------------------------------------------
revno: 2641
revision-id: frazer@stripped
parent: jonas@stripped
parent: frazer@stripped
committer: Frazer Clement <frazer@stripped>
branch nick: mysql-5.1-telco-6.3
timestamp: Wed 2008-07-23 12:25:03 +0100
message:
  Merge 6.2 into 6.3
modified:
  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp sp1f-dblqhmain.cpp-20040414082419-5mtvgr6eg47fgddawjjch74crdnaduvi
  storage/ndb/test/ndbapi/testOIBasic.cpp sp1f-testoibasic.cpp-20040414082437-d643bl36jjvdl5h45jndvvxibkbwrpgh
    ------------------------------------------------------------
    revno: 2572.20.9
    revision-id: frazer@stripped
    parent: jonas@stripped
    committer: Frazer Clement <frazer@stripped>
    branch nick: mysql-5.1-telco-6.2
    timestamp: Wed 2008-07-23 12:15:31 +0100
    message:
      Bug 38204 : NDBAPI : MRR IndexScan fails with certain bound lengths
        
      testOIBasic with mrr (separate patch) fails in some cases.
    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp sp1f-dblqhmain.cpp-20040414082419-5mtvgr6eg47fgddawjjch74crdnaduvi
      storage/ndb/test/ndbapi/testOIBasic.cpp sp1f-testoibasic.cpp-20040414082437-d643bl36jjvdl5h45jndvvxibkbwrpgh

--===============1657765351==
MIME-Version: 1.0
Content-Type: text/text/x-diff; charset="us-ascii"; name="patch-2641.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2008-05-30 06:35:19 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2008-07-23 11:25:03 +0000
@@ -8964,7 +8964,7 @@
     
     if(len < left)
     {
-      offset = len;
+      offset = tcPtrP->m_offset_current_keybuf + len;
     }
     else
     {

=== modified file 'storage/ndb/test/ndbapi/testOIBasic.cpp'
--- a/storage/ndb/test/ndbapi/testOIBasic.cpp	2008-04-10 16:54:09 +0000
+++ b/storage/ndb/test/ndbapi/testOIBasic.cpp	2008-07-23 11:25:03 +0000
@@ -614,6 +614,10 @@
       uint n = urandom(maxcsnumber);
       cs = get_charset(n, MYF(0));
       if (cs != 0) {
+        // avoid dodgy internal character sets
+        // see bug# 37554
+        if (cs->state & MY_CS_HIDDEN)
+          continue;
         // prefer complex charsets
         if (cs->mbmaxlen != 1 || urandom(5) == 0)
           break;


--===============1657765351==--