From: Jon Olav Hauglid
Date: November 22 2010 10:50am
Subject: bzr commit into mysql-5.5-bugteam branch (jon.hauglid:3127)
List-Archive: http://lists.mysql.com/commits/124611
Message-Id: <201011221052.oAM6PEig016653@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5952809562436288333=="

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

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

 3127 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:50:20 +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)


--===============5952809562436288333==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/jon.hauglid@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jon.hauglid@stripped
# target_branch: file:///export/home/x/mysql-5.5-bugteam-test/
# testament_sha1: 36788ae354c853836e108d653f766f3a4447a3e1
# timestamp: 2010-11-22 11:50:23 +0100
# source_branch: file:///export/home/x/mysql-5.5-runtime/
# base_revision_id: davi.arnaut@stripped\
#   d9t9s6m4ki4d8fds
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVtW/9EAAZPfgGAQUOf//1ZW
hAS////wUAQNeANaO2KGnDQglPKeUeDQFNqPSbFPKYgAZNANEk002IaaT1A0AAANAAANTTKaaaQ0
0DQBoAABoBoBzAJgBMAAJgACYAAkiEBoQ0yAKemQJPSbUPSaMjJ6iouc7Kj9pgumdNplGyIgIGqc
ulE3/Ve6QmQzrsMzHv5lwRlxYdESLPjPVkhpzSD6VI3jX2eN9x7pwjY6yAqECwggvUGKZzKU1aVL
UpJuEbbFyUuoy0CGCVbx1UJfBjrFajFI5iI/wyOnVT2Q0CquOe62y6imps1vSL1clbt1whLZEUvr
vFBljFnEOkTF3nD0aIj5Zn3NRV5F6pUK/sUReLw/XBOwP9vD+JCL9KqYWw5bo3tSI2EqMiSCujKy
rNaldW3W2k+/plzsMDYxOzeUm/LK/RZhiltBOgncWsg9KYFWuG9TZ91VON04g/Ar5EK6LWU4UJk6
NNu1i0x/0x7hfklRWQUFpbDJzjBaJ/PXqIUzTNialuvbV3qPYXiaKz4ac2S2ybqTiatfX8v0VLjz
evrwDpSSuOdcVu4812ob2ruzmuROafWXvSQIDNVGTUSHIKwTX0PhdlIhSbJ2m0V1sw5bfNYLRRY8
4O9cVs2aWgYFhrTUTSeCAMaWnWLFGJ0cRkMs2GUZIFMUp+EgRF39QuO32coh7dtFNrBeEfWJ3HdA
NsN/vnd8/kkabzgV3yBTo89LI2UZwgsS2gYMcbDf4rImKLuuLPK1sYAjDdKsRaw7R6BkVnnSUnDT
8t98HrZkh8zckYV7iVNyH8sOV5REkpJvitBiqBE1HDCenXHscihVWlWCtzrs4hxY3a/hEFkQ7fR+
+Lab8G4vXUE+sv+FSTL8C9rar+HCqA1UUp4TPZ2QGzBqCEYcRk0VXmuklOnP+tRPmam30APFOzYP
Ga6qzG4ZhjJXBZIMgZNlGwnffZkL6kGANA8+Q8IAWfCMGDLb2PNxh3bmDwSZHvPmPDmeGlQ6pjl0
WFPe2jT8fqnSevkZJzPsZPZcGiMJ/3wzooDQYhaeV8tNovY9RrZ8CzTzWYfUzW4MsAwgHv1mkMfH
pFCD10AA67lqhgh3ggvMk3XGeAmJ4UW2nB09Frgj9VmrR1wxJxtK2thojCCCoXmJy6Mk1TZsiMqo
J2cKqbRYbMI4ipRUyZaPHv7m1lxZYtaF72eqTL15UFnukMi9ejraZ+168N3FmUHYl418Yyyp7GRs
tK9yvwHvZMkvDW8ke8+eAVX86b61J9UQ9sDCt6SpRag3tHdD0FrBUE5LoU1gw5heOWZ+QB5IgPHU
8qASBpNcRsYSIyh9CWRKGMb9W3BzfQDpeldm3AkRtRctw2yl0+PEVWrZhELQG39C7XKtlqb6Tjde
oSTBSKQcjFyFMgjpkrOJXIwM/i7kinChILat/6I=


--===============5952809562436288333==--