summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorunknown <dkatz@damien-katzs-computer.local>2007-07-13 00:45:54 -0400
committerunknown <dkatz@damien-katzs-computer.local>2007-07-13 00:45:54 -0400
commit4bbeef1c123213fc73fe8bb23f77607176c06086 (patch)
tree6672a514131b39ffd3b0680e1fbcc041d801a869 /extra
parent91112d124e0daf124a838c636ec93eed470aeb3d (diff)
downloadmariadb-git-4bbeef1c123213fc73fe8bb23f77607176c06086.tar.gz
Minor fixes for test failures and compiler warnings for Bug #29579.
BitKeeper/deleted/.del-ssl_big.test: Delete: mysql-test/t/ssl_big.test extra/yassl/include/yassl_int.hpp: added comment extra/yassl/src/yassl_int.cpp: Changed init order to fix a compiler warning. mysql-test/r/mysqltest.result: There is no limit to connections anymore. mysql-test/t/mysqltest.test: There is no limit to connections anymore.
Diffstat (limited to 'extra')
-rw-r--r--extra/yassl/include/yassl_int.hpp2
-rw-r--r--extra/yassl/src/yassl_int.cpp2
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));