Merge from mysql-5.1 to mysql-5.5

ce7b4f6d · Jon Olav Hauglid · 2b992304 · 7de029da · ce7b4f6d
Commit ce7b4f6d authored Jun 17, 2011 by Jon Olav Hauglid
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

extra/yassl/src/yassl_error.cpp extra/yassl/src/yassl_error.cpp +1 -1

No files found.
--- a/extra/yassl/src/yassl_error.cpp
+++ b/extra/yassl/src/yassl_error.cpp
@@ -128,7 +128,7 @@ void SetErrorString(unsigned long error, char* buffer)
        break;

    case badVersion_error :
-        strncpy(buffer, "protocl version mismatch", max);
+        strncpy(buffer, "protocol version mismatch", max);
        break;
        
    case compress_error :