diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2011-06-17 09:53:12 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2011-06-17 09:53:12 +0200 |
| commit | ce7b4f6d6518d5ad7b66e6cd74d34c467d5d6b50 (patch) | |
| tree | d93efab6f3d0e60937322de3d1d0cf0d46fca200 /extra | |
| parent | 2b992304b4c673921cfa3634f5a9a07c56cf9e37 (diff) | |
| parent | 7de029da9a1ef8841c2f7d21299583a5e5671e46 (diff) | |
| download | mariadb-git-ce7b4f6d6518d5ad7b66e6cd74d34c467d5d6b50.tar.gz | |
Merge from mysql-5.1 to mysql-5.5
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/src/yassl_error.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/yassl/src/yassl_error.cpp b/extra/yassl/src/yassl_error.cpp index dd30348cd93..862cd82fb3b 100644 --- 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 : |