diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2009-11-06 18:35:04 +0200 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2009-11-06 18:35:04 +0200 |
| commit | 69d6fcbd3b225c177c4e0e3af65aa2cf9494eff3 (patch) | |
| tree | 44a02955b1dc18fc2e94cd0b4dc6ef62cd81d936 /extra/yassl/src/yassl_int.cpp | |
| parent | ea84da107a8d8f6b061d00dcf76c3369f8a96868 (diff) | |
| parent | 684b1d39ac7eab6ff5d9095aaa25dcea35b88a28 (diff) | |
| download | mariadb-git-69d6fcbd3b225c177c4e0e3af65aa2cf9494eff3.tar.gz | |
merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640
Diffstat (limited to 'extra/yassl/src/yassl_int.cpp')
| -rw-r--r-- | extra/yassl/src/yassl_int.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/yassl/src/yassl_int.cpp b/extra/yassl/src/yassl_int.cpp index b7f91d72166..8e4a9aa95ec 100644 --- a/extra/yassl/src/yassl_int.cpp +++ b/extra/yassl/src/yassl_int.cpp @@ -1833,7 +1833,7 @@ SSL_CTX::GetCA_List() const } -const VerifyCallback SSL_CTX::getVerifyCallback() const +VerifyCallback SSL_CTX::getVerifyCallback() const { return verifyCallback_; } |