diff options
| author | monty@narttu.mysql.fi <> | 2003-10-07 15:42:26 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-10-07 15:42:26 +0300 |
| commit | 6056cfadfcb07cda12f6dc01ec9c1ab07067ac69 (patch) | |
| tree | d89c080ef636608e316f1166b1628cd1d902deec /include | |
| parent | 0091fa2e3266da6a17b0615a4696c25a4d36d664 (diff) | |
| parent | 446d40e880c0e6ab6ac56b0082d4883ef5c7d467 (diff) | |
| download | mariadb-git-6056cfadfcb07cda12f6dc01ec9c1ab07067ac69.tar.gz | |
Merge with 4.0.16
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 10 | ||||
| -rw-r--r-- | include/mysql.h | 11 |
2 files changed, 16 insertions, 5 deletions
diff --git a/include/my_global.h b/include/my_global.h index 0e576730ca3..637b8d4b371 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1130,4 +1130,14 @@ 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 */ diff --git a/include/mysql.h b/include/mysql.h index 5441910efa9..a8ced90f414 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -409,11 +409,12 @@ int STDCALL mysql_refresh(MYSQL *mysql, unsigned int refresh_options); int STDCALL mysql_kill(MYSQL *mysql,unsigned long pid); int STDCALL mysql_ping(MYSQL *mysql); -const char * STDCALL mysql_stat(MYSQL *mysql); -const char * STDCALL mysql_get_server_info(MYSQL *mysql); -unsigned long STDCALL mysql_get_server_version(MYSQL *mysql); -const char * STDCALL mysql_get_client_info(void); -const char * STDCALL mysql_get_host_info(MYSQL *mysql); +const char * STDCALL mysql_stat(MYSQL *mysql); +const char * STDCALL mysql_get_server_info(MYSQL *mysql); +const char * STDCALL mysql_get_client_info(void); +unsigned long STDCALL mysql_get_client_version(void); +const char * STDCALL mysql_get_host_info(MYSQL *mysql); +unsigned long STDCALL mysql_get_server_version(MYSQL *mysql); unsigned int STDCALL mysql_get_proto_info(MYSQL *mysql); MYSQL_RES * STDCALL mysql_list_dbs(MYSQL *mysql,const char *wild); MYSQL_RES * STDCALL mysql_list_tables(MYSQL *mysql,const char *wild); |