Commit 7cc50597 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
parents 46e1b71f 23fbae1f

extra/yassl/src/ssl.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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);

sql/net_serv.cc

+4 −1
Original line number Diff line number Diff line
@@ -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)