Commit de389ee5 authored by unknown's avatar unknown
Browse files

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0 

into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0
parents d4c72a85 85803ddf

include/my_global.h

+0 −10
Original line number Diff line number Diff line
@@ -1138,14 +1138,4 @@ typedef union { 
#define statistic_add(V,C,L)       (V)+=(C)

#endif



#ifdef HAVE_OPENSSL

#include <openssl/opensslv.h>

#if OPENSSL_VERSION_NUMBER < 0x0090700f

#define DES_cblock des_cblock

#define DES_key_schedule des_key_schedule

#define DES_set_key_unchecked(k,ks) des_set_key_unchecked((k),*(ks))

#define DES_ede3_cbc_encrypt(i,o,l,k1,k2,k3,iv,e) des_ede3_cbc_encrypt((i),(o),(l),*(k1),*(k2),*(k3),(iv),(e))

#endif

#endif



#endif /* my_global_h */

include/violite.h

+8 −0
Original line number Diff line number Diff line
@@ -78,6 +78,14 @@ my_bool vio_poll_read(Vio *vio,uint timeout); 
void vio_timeout(Vio *vio,uint timeout);



#ifdef HAVE_OPENSSL

#include <openssl/opensslv.h>

#if OPENSSL_VERSION_NUMBER < 0x0090700f

#define DES_cblock des_cblock

#define DES_key_schedule des_key_schedule

#define DES_set_key_unchecked(k,ks) des_set_key_unchecked((k),*(ks))

#define DES_ede3_cbc_encrypt(i,o,l,k1,k2,k3,iv,e) des_ede3_cbc_encrypt((i),(o),(

#endif



#define HEADER_DES_LOCL_H dummy_something

#include <openssl/ssl.h>

#include <openssl/err.h>