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

--===============0243166425119211209==
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

 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)


--===============0243166425119211209==
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: 1d39aa02d42bd583f1eecf21525fe567100e8947
# timestamp: 2010-11-22 11:35:26 +0100
# source_branch: file:///export/home/x/mysql-5.5-runtime/
# base_revision_id: davi.arnaut@stripped\
#   zfcdxbihue29aiwz
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcVF60QAAZBfgGAQUOf//1ZW
hAS////wUAQNeAzYbmGjThpok1T9TKfqmjTYTRNNPSHpPSAaND1NGBoiRkNqHqZkIPUaAAGgAAGi
ZEwVPyERtNCNA0AAANAOYBMAJgABMAATAAEkUyaEwmJo0R5QAp4FD1AbKHlGjMa6j84g6lV8SmGq
KASvoodUq+f5X5YkkjO7KSRt90vV2lgjU1YnhtyYSt88B+nRGoz2alkU7doV92VQc4MCiFjCRpIM
z3LU5mXpv531u6KZ81twUhGzfuehbJbdIyMRSOYiPm0TZHVXveVZpnVuVNksabMlxSLlclZwymmj
KAo/y/E7YM4h0hlHsF3QFg2R8K87ypUKdPRP+CURvSxOwP+O33iI/S8VG80zmtaQjeRngshhUUyy
ypxMFadddcdh5aTFpz5ubHqsImNdc9e8FUnSYkwoXrygKDFfxxVCbHOTqOFUohwFfzG2cVfHQJr3
Kkmsc56IyTkhZT8carir/DfGozFOsdr2Ndfb63mk9aZsS0WW3d3GsjXbQ9BnkKJ/t+qncdllMVZH
RTrBYzh9RpbJparG2eOSJNDgT3lC65DE7KhBqUVpme+WE4i9ochPZfMScIhxaKWgUc3EEbZhUYy1
SrW40D2B8GQwMgcA+B1XDH4Rl752I07LusWYEeickxBJ+r2iOr+3J5vf22y2MFoQ9oHSOFvHXX7f
fbp5+aRz7rx1tgGi4+UpZbpZHQL8rBeS+gxnzaLVfMEozLw5Lx2c/j6iwMC/v1z+16a8Q8Ju0Lis
6fSaaRC9Ze1nRhB6WZIfmNUjbs1IysQ+7b1egt95R360FKpUHwJxF9ya+3HSHI6idWQD4Z6lCOsD
WYXd41ALINkri9EFNjLs1h6mReBTY1wlD9lYWaX5FzPTX6qzVRUBU8kDDd2QGNDEEFiYjJokSy0t
p03ZHKpGdaKdACSbSjYLjmSoF4TxFGIhdBlaF8mfPR2HRm52DOSuQ80wFV4tYwYN2eR2uMO7aA8y
TI+rNB5tDcu/FQ6Uxtul1ttv8P4TpPRzGi3qY4dRvfZ1hfCaz+tM55wvNwbDu0V0+Puew2yvUqw4
B6HBcgysCyYPrTYkMcumusbHcA3DSE1dVfqIg3nzM3YYKccmOJwpuY5QyGbPot4a3iayEDklqohE
JsQjceUyCtdMnZwqlblbNFE7Jlb29fU2BsKaVehfVX2ky8eacq+0hkWrxdbzd72rsgLhxZlB2J+2
nlCOUuoyOHIVhVyVu0e5kyS7Mnij7s02hRdZK2lRfCAe1xdS8ihQacWzemToEMcEb8Clhx11vQgJ
qBpzweawFUDMcKjYaiRQQ3EZsIWX8LXOM4Ol8U1cLSJDYixZjb5OnwlflbmuYKwGfoLN0aWWDfvX
Cy1TRTBAOcxcpkrk04XzFNQ2BNE1ofBTkTBxF3JFOFCQxUXrRA==


--===============0243166425119211209==--