diff options
| author | unknown <dkatz@damien-katzs-computer.local> | 2007-07-13 00:47:37 -0400 |
|---|---|---|
| committer | unknown <dkatz@damien-katzs-computer.local> | 2007-07-13 00:47:37 -0400 |
| commit | 58b783b4e95af3d0216a1573b4042d707f383540 (patch) | |
| tree | 8d3ce10d523d13cc75873b4623c011dfb9f4f1be /extra | |
| parent | f6895c6dfd930f676ced5fcc5139ce381a9ba4c2 (diff) | |
| parent | 4bbeef1c123213fc73fe8bb23f77607176c06086 (diff) | |
| download | mariadb-git-58b783b4e95af3d0216a1573b4042d707f383540.tar.gz | |
Merge damien-katzs-computer.local:/Users/dkatz/50
into damien-katzs-computer.local:/Users/dkatz/mysql51
extra/yassl/include/yassl_int.hpp:
Auto merged
extra/yassl/src/yassl_int.cpp:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/include/yassl_int.hpp | 2 | ||||
| -rw-r--r-- | extra/yassl/src/yassl_int.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extra/yassl/include/yassl_int.hpp b/extra/yassl/include/yassl_int.hpp index b207f0bffbd..b7bd35f5fa2 100644 --- a/extra/yassl/include/yassl_int.hpp +++ b/extra/yassl/include/yassl_int.hpp @@ -584,7 +584,7 @@ class SSL { Socket socket_; // socket wrapper Buffers buffers_; // buffered handshakes and data Log log_; // logger - bool quietShutdown_; + bool quietShutdown_; // shutdown without handshakes // optimization variables bool has_data_; // buffered data ready? diff --git a/extra/yassl/src/yassl_int.cpp b/extra/yassl/src/yassl_int.cpp index ba4678d70b9..f5ab2f200a5 100644 --- a/extra/yassl/src/yassl_int.cpp +++ b/extra/yassl/src/yassl_int.cpp @@ -291,7 +291,7 @@ const ClientKeyFactory& sslFactory::getClientKey() const SSL::SSL(SSL_CTX* ctx) : secure_(ctx->getMethod()->getVersion(), crypto_.use_random(), ctx->getMethod()->getSide(), ctx->GetCiphers(), ctx, - ctx->GetDH_Parms().set_), has_data_(false), quietShutdown_(false) + ctx->GetDH_Parms().set_), quietShutdown_(false), has_data_(false) { if (int err = crypto_.get_random().GetError()) { SetError(YasslError(err)); |