bzr commit into mysql-5.5-bugteam branch (jon.hauglid:3126)

[Jon Olav Hauglid]

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

 3126 Jon Olav Hauglid	2010-11-22
      This patch fixes the bug which caused the funcs_1.storedproc
      test case to give valgrind warnings.
      
      The problem was that when comparing two MDL key buffers using
      memcmp(), 1 was added to the buffer length. However, this was
      no longer needed since the buffer length already included the
      '\0' terminator.

    modified:
      sql/mdl.h
=== modified file 'sql/mdl.h'
--- a/sql/mdl.h	2010-11-11 17:11:05 +0000
+++ b/sql/mdl.h	2010-11-22 10:35:23 +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)


Attachment: [text/bzr-bundle] bzr/[e-mail]