diff options
| author | Joerg Bruehe <joerg.bruehe@oracle.com> | 2012-03-02 13:23:52 +0100 |
|---|---|---|
| committer | Joerg Bruehe <joerg.bruehe@oracle.com> | 2012-03-02 13:23:52 +0100 |
| commit | bfaebe3f5e4b917c4498e234bad7a9d45d07ca62 (patch) | |
| tree | d5f9b580b8298c368c983d1fe6510f2c0da959bd /extra/yassl/include | |
| parent | f7f34f7e866fdf11662eb1053b15a36a7c0d4a2a (diff) | |
| parent | ceec7cea338e117d15a9679e517cc2bb24d44fcc (diff) | |
| download | mariadb-git-bfaebe3f5e4b917c4498e234bad7a9d45d07ca62.tar.gz | |
Further upmerge the yaSSL upgrade (to 2.2.0) from MySQL 5.1 to 5.5.
Also, take a syntax fix (C++ style comment in C file) in client/mysqldump.c.
Diffstat (limited to 'extra/yassl/include')
| -rw-r--r-- | extra/yassl/include/openssl/ssl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/yassl/include/openssl/ssl.h b/extra/yassl/include/openssl/ssl.h index 0ae54f070bd..0d99888da88 100644 --- a/extra/yassl/include/openssl/ssl.h +++ b/extra/yassl/include/openssl/ssl.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005-2007 MySQL AB, 2008 Sun Microsystems, Inc. + Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. Use is subject to license terms. This program is free software; you can redistribute it and/or modify @@ -35,7 +35,7 @@ #include "rsa.h" -#define YASSL_VERSION "2.1.4" +#define YASSL_VERSION "2.2.0" #if defined(__cplusplus) |