From: Date: July 23 2008 1:16pm
Subject: bzr commit into mysql-5.1-telco-6.2 tree (frazer:2633) Bug#38204
List-Archive: http://lists.mysql.com/commits/50294
X-Bug: 38204
Message-Id: <200807231116.m6NBG35T005880@forth.ndb.mysql.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1007306590=="

--===============1007306590==
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.2/

------------------------------------------------------------
revno: 2633
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
per-file comments:
  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    Move through data buffers correctly when bound is contained within one, but not starting at offset zero.
  storage/ndb/test/ndbapi/testOIBasic.cpp
    Avoid use of character set 'Filename' (and any other internal character sets) as they do not seem to behave consistently

--===============1007306590==
MIME-Version: 1.0
Content-Type: text/text/x-diff; charset="us-ascii"; name="patch-2633.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:33:46 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2008-07-23 11:15:31 +0000
@@ -8955,7 +8955,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 13:08:05 +0000
+++ b/storage/ndb/test/ndbapi/testOIBasic.cpp	2008-07-23 11:15:31 +0000
@@ -612,6 +612,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;


--===============1007306590==--