From: Jon Olav Hauglid
Date: June 16 2011 1:06pm
Subject: bzr commit into mysql-trunk branch (jon.hauglid:3213) Bug#12657095
List-Archive: http://lists.mysql.com/commits/139329
X-Bug: 12657095
Message-Id: <201106161307.p5GD72vv000717@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0568584529207754039=="

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

#At file:///export/home/x/mysql-trunk-bug12657095/ based on revid:marko.makela@stripped

 3213 Jon Olav Hauglid	2011-06-16
      Bug#12657095 YASSL ERROR MESSAGE CONTAINS TYPO 
      
      This patch fixes a typo in an 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-16 13:06:44 +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 :


--===============0568584529207754039==
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-trunk-bug12657095/
# testament_sha1: 5b7a5ac85bf404e6a3d2cf291a5e0176ff327e30
# timestamp: 2011-06-16 15:06:52 +0200
# source_branch: file:///export/home/x/mysql-5.5/
# base_revision_id: marko.makela@stripped\
#   vhjkv8xrx6hsa1wc
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWROF1j8AAYffgAQQWGf//3r3
3CC////wUAO1ZepO6WwzXXCSmpT0NGmjQ1T9GRo0hmkyT9JMJ6no1HplGgyRMp4k8p5ATVPQmYgj
EZNMAJo0wJJAjIjQ1MnlT1M0TMQRpo0ZBoAeocwCYCZGAEYmJhMJghpiaYCURNU/TVPNCnqZqeER
o0BoAZAAAKEcsU8fMWX2gXaMYkBt7F5qlKjyIF2wp0wREHl3H1qbWwyZvXVt6b7flS3y6xw9+X+h
zSdIPszrjg9+cWXpdkpjjrTzihD63L1+9lIj2BEtoOnDfn+ZYcA2YH/BK4YgihRRO6VXvsfhjEVv
YnOcRbWwh5eZMnTIefsx8KTQWik1ekoohok5sqKhnlIUhBBpMs98ytBCNq7tkY3FkhZ1D6i3q1nt
DFg8EsXQIE5R6sIab8BPeePYGelAwvif2YKIWEK3E6LnaNHxKCWpwbo4fExcQ6ArxCBoiVlZkjVs
0mowEqCTpIDBcDdOoLEUmDlsClgvdbdIKwcWzueTGy2acuwyS5AoiZpRoKXWRbKJAyjIOsFZSgPQ
LFExuLivWtJGZq6EfsKVX7QnCl+FZc8X2aLVSB0Ibn/9M1ApzQjipjoc5z6wUx1ZoBedwqpjWJi4
STAGuEVB0AlMkYIlyxY5ZRyNDXgOenT0CmDZgqjTZvbbnT6U1fTrBE4c53nRf5Pt88mc/bHufDrz
4vxPvZP5NOsvhXmbO25YY3o8PW8jSqARW03m+pX++nDsO+AiK1cHg0K9XHcjsP20WVwBwzjrhSjv
9l+vcee/ftrKz6cZSYy1YenH049oT2pyk4ukgFdPLGQx+xcMJIflmFpO3pqzuYR5/VIxZSjmnaat
+uWUrWwUlyD6SEYXR5B4WMnsagI60GGqqiX766O27Y25IqLQOHjEDc/L6SYlMfGOB2rmxqVGo0py
k7seOx4fStU8qcahCBVPZCoxF6VKNWyr+68BM42D5mF2ZxPAPKUkZgzpWdhXkWnwXcZy+pzGaMxh
1UaEyTWcpOmMhCEO6eR6VH7wSBSQv3ohSTWl8HIddiosa5Wm0LcTBOotda8SvdSEoSsDA5cKswi5
x7QHbNM7EjqWC0GRuib3QsHbK5RUXvc4owiUK4hBrttTkPZMubr2rdO9C4VGCTLGIuAioKGCjJiz
ZadQeLbkQpNoez7PobX7b6v0RWkuLejlko4qXUaoCXROpF3LqJ+qKrUx/FiDSFGPp709Qu7iWhXD
tFXSKW00zAzXHrAJN6/lXLLExBFih/Z2SaFXGRGjsuBuhx3zHVhNTc7ik5X016W+DWgNupNqEedO
91qseWIJyj8LvIc5CMsG9QA9acZrhlhIJqmkhO+HEeP/F3JFOFCQE4XWPw==


--===============0568584529207754039==--