bzr commit into mysql-trunk branch (jon.hauglid:3218)

[Jon Olav Hauglid]

#At file:///export/home/x/mysql-trunk-test/ based on revid:dmitry.lenev@stripped

 3218 Jon Olav Hauglid	2011-06-17 [merge]
      Merge from mysql-5.5 to mysql-trunk

    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 :

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).