diff options
| author | monty@mashka.mysql.fi <> | 2003-10-08 22:12:32 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-10-08 22:12:32 +0300 |
| commit | 9bba878b8c6b6abd9be97a9d5a6c89bda8762693 (patch) | |
| tree | 9974b278f962fdebee44503151a92f7319332982 /include | |
| parent | 9d0859c48b666b98de66f93a00031ff5044fad06 (diff) | |
| parent | 75e74c79ec1b9c057bef6670e56cfa1e3eb5f076 (diff) | |
| download | mariadb-git-9bba878b8c6b6abd9be97a9d5a6c89bda8762693.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 10 | ||||
| -rw-r--r-- | include/mysql.h | 9 |
2 files changed, 15 insertions, 4 deletions
diff --git a/include/my_global.h b/include/my_global.h index 9d08977a7cd..59e0c43f18d 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1105,4 +1105,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 b27d98e7e57..95730c0f2f5 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -349,10 +349,11 @@ 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); -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 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); |