bzr commit into mysql-trunk-bugfixing branch (jon.hauglid:3382)

[Jon Olav Hauglid]

#At file:///export/home/x/mysql-trunk-bugfixing-test/ based on revid:davi.arnaut@stripped

 3382 Jon Olav Hauglid	2010-11-22 [merge]
      Merge from mysql-5.5-bugteam to mysql-trunk-bugfixing
      No conflicts

    modified:
      sql/mdl.h
=== modified file 'sql/mdl.h'
--- a/sql/mdl.h	2010-11-18 16:34:56 +0000
+++ b/sql/mdl.h	2010-11-22 11:20:49 +0000
@@ -252,7 +252,7 @@ public:
       character set is utf-8, we can safely assume that no
       character starts with a zero byte.
     */
-    return memcmp(m_ptr, rhs->m_ptr, min(m_length, rhs->m_length)+1);
+    return memcmp(m_ptr, rhs->m_ptr, min(m_length, rhs->m_length));
   }
 
   MDL_key(const MDL_key *rhs)

No bundle (reason: revision is a merge).