diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-12-14 21:48:58 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-12-14 21:48:58 +0100 |
| commit | 7cc50597b0a42a1413b84b8579a38c4aa2c46f17 (patch) | |
| tree | 3a23f8fe6818b1c94c928f085b0e0c0e79cbe188 | |
| parent | 46e1b71f68031ba249c375bbc71ae0355af71acd (diff) | |
| parent | 23fbae1f1946fadbf81dc23b8a20a4af1f0e171a (diff) | |
| download | mariadb-git-7cc50597b0a42a1413b84b8579a38c4aa2c46f17.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
| -rw-r--r-- | extra/yassl/src/ssl.cpp | 4 | ||||
| -rw-r--r-- | sql/net_serv.cc | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/extra/yassl/src/ssl.cpp b/extra/yassl/src/ssl.cpp index ec2e99adecb..aa98465069c 100644 --- a/extra/yassl/src/ssl.cpp +++ b/extra/yassl/src/ssl.cpp @@ -122,7 +122,7 @@ int read_file(SSL_CTX* ctx, const char* file, int format, CertType type) 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* file, int format, CertType type) 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); diff --git a/sql/net_serv.cc b/sql/net_serv.cc index e84b2266e82..3037007ae35 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -597,7 +597,10 @@ net_real_write(NET *net,const char *packet,ulong len) } #endif /* HAVE_COMPRESS */ - /* DBUG_DUMP("net",packet,len); */ +#ifdef DEBUG_DATA_PACKETS + DBUG_DUMP("data",packet,len); +#endif + #ifndef NO_ALARM thr_alarm_init(&alarmed); if (net_blocking) |