From: Jon Olav Hauglid
Date: June 17 2011 7:51am
Subject: bzr commit into mysql-5.1 branch (jon.hauglid:3655) Bug#12657095
List-Archive: http://lists.mysql.com/commits/139389
X-Bug: 12657095
Message-Id: <201106170751.p5H7psiZ005131@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8335874819106264132=="

--===============8335874819106264132==
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.1-test/ based on revid:dmitry.lenev@stripped

 3655 Jon Olav Hauglid	2011-06-17
      Bug#12657095 YASSL ERROR MESSAGE CONTAINS TYPO 
      
      This patch fixes a typo in a YaSSL error message.

    modified:
      extra/yassl/src/yassl_error.cpp
=== modified file 'extra/yassl/src/yassl_error.cpp'
--- a/extra/yassl/src/yassl_error.cpp	2010-02-22 13:23:47 +0000
+++ b/extra/yassl/src/yassl_error.cpp	2011-06-17 07:51:34 +0000
@@ -128,7 +128,7 @@ void SetErrorString(unsigned long error,
         break;
 
     case badVersion_error :
-        strncpy(buffer, "protocl version mismatch", max);
+        strncpy(buffer, "protocol version mismatch", max);
         break;
         
     case compress_error :


--===============8335874819106264132==
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.1-test/
# testament_sha1: 69906350e6f7eb01e52fd79d5175d482d0bdec37
# timestamp: 2011-06-17 09:51:45 +0200
# base_revision_id: dmitry.lenev@stripped\
#   fx2ie67tj42secpq
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQD0H3kAAXtfgEQQWGf//3r3
3CC////wUAOllEsND3DXCUSaJiPQU9MERgSepsg2lNNGmaaj0yj1BlE00ap+CTKe1TT01NNPSMga
A0AAACSRNNTyGpknoahNojyTamjQ8oAADTQ5piZMmjCYJiaYBMAhgjAjAJSp6jQAGQNAZBkNNBoA
yAA2tJcdq77jDVBSlU9cqBTDXia+1jJdij1d+ndGqqb/VOLYFFRVPTu8eX2i87LXvm96+/x/nZae
UdTFvqGD+Sdfy6qCaa5HlF6D72Tc/7iqePoEYpaTblq0g9Mcxw+RK7HS1QIrKSWF+l735c0BWs15
rZIdoLXr2UHncZVRQR5BWMYKpd6JNZVoqhiLOiQ3aeeBSNHoOUz75laB9V3CrPqKNQLQq0FqZHvC
8r8GajLQCkGWOyQfVYHyQMYUdYyIEYqT3W3J09KwK3qM8DOVV31h0lZgQ2ryklWw0QuLHCHR1yY4
1DyGJbO8U4LqhnvP6oLnr3E55NTVHMQbYRgTo8uGdXy0MhX3KPVsC3X3yLwYjE6CJCcgQLJg0VyF
hwi4soE8pgXCCQWxjXUTjs2oxNOd5c6oTLDYKfe5SFsc62cW0X7DlonoDlbLERaEZBWE7AzXPpUz
rFha1ZRw6L00WeV5gjmbjwMJb79+KdzfDt4KCJ4XcucUiiqv38puD7PngxX4x7j+ufH3fkfedziR
l/Y2GZZ11JbioQ8/F4fj7SEVHw1nfrG4d0fTwO+58QmhimGhLd1YGtiQ9g+gxTnQiUztn3LtN224
U6Pn1eKr2MsLIJ+XjvzhZIJ5WnUes73pKUHm5pOPH4fyGXNejYohv3ohWqONC0tcLrc67RSVG8JU
CKoXCBfPHMzWkAp8BFZguzDRf7q1ZgvB26isrRYrLJp1c6yuXSt/iwnSTQZEVI9FLoNnRIcnDrrS
GhHAxPhthnOwoy0Fi4DT/ezCTKaSVIGxCMAxpWUsYHaiQ9htz6DWSpaVlWInzUZEYiMtSHMYkYWD
gdsxYXqkOFGcMyGB+Zyd+PefArpMr+5cdRYEerEIoR4zvXwYBhQKDi7REHVDiPgR71WbPRDETo2C
U92Vg7atmaNarezE2ERhKAVXpzbtQnIeyZdO+YuqWKF4RPWkynAXgIiE1Nyug9Yci5yRo5GZNvrJ
Q80sFoxE5T63vgKbK7s2W5ZOWpy7DTUJbpRRn6NJLbmUh1MgaAoc7FaZ9OJVcVda6adwxrpSwHTI
tMG6bda9cMhSDmCh00Mb3Ktw4eGMknsNUFeGM2I9EFisc7FRcnT4i6Nbe24B2+e0TYENKdwuVtQb
jxyFoGLeDQ81sAnpQRuQF7gy7hTY0aGguqGr/F3JFOFCQAPQfeQ=


--===============8335874819106264132==--