Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2006-12-13 23:30:20+01:00, msvensson@neptunus.(none) +1 -0
change all auto_ptr in yaSSL to mySTL since some lack reset
extra/yassl/src/ssl.cpp@stripped, 2006-12-13 23:30:17+01:00, msvensson@neptunus.(none) +2 -2
change all auto_ptr to mySTL since some lack reset
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: msvensson
# Host: neptunus.(none)
# Root: /home/msvensson/mysql/mysql-5.0-maint
--- 1.21/extra/yassl/src/ssl.cpp 2006-12-13 23:30:26 +01:00
+++ 1.22/extra/yassl/src/ssl.cpp 2006-12-13 23:30:26 +01:00
@@ -122,7 +122,7 @@ int read_file(SSL_CTX* ctx, const char*
EVP_BytesToKey(info.name, "MD5", info.iv, (byte*)password,
passwordSz, 1, key, iv);
- STL::auto_ptr<BulkCipher> cipher;
+ mySTL::auto_ptr<BulkCipher> cipher;
if (strncmp(info.name, "DES-CBC", 7) == 0)
cipher.reset(NEW_YS DES);
else if (strncmp(info.name, "DES-EDE3-CBC", 13) == 0)
@@ -138,7 +138,7 @@ int read_file(SSL_CTX* ctx, const char*
return SSL_BAD_FILE;
}
cipher->set_decryptKey(key, info.iv);
- STL::auto_ptr<x509> newx(NEW_YS x509(x->get_length()));
+ mySTL::auto_ptr<x509> newx(NEW_YS x509(x->get_length()));
cipher->decrypt(newx->use_buffer(), x->get_buffer(),
x->get_length());
ysDelete(x);
| Thread |
|---|
| • bk commit into 5.0 tree (msvensson:1.2355) | msvensson | 13 Dec |