bzr commit into mysql-5.1-telco-6.2 branch (gni:2634)

[Guangbao Ni]

#At file:///home/ngb/mysql/bzr/telco6.2-bug33801/

 2634 Guangbao Ni	2008-07-24 [merge]
      merge from remote server
modified:
  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
  storage/ndb/test/ndbapi/testOIBasic.cpp

per-file messages:
  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    merge from remote server
  storage/ndb/test/ndbapi/testOIBasic.cpp
    merge from remote server
=== 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 @@ Dblqh::copy_bounds(Uint32 * dst, TcConne
     
     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 @@ getcs(Par par)
       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;