diff options
| author | tomas@whalegate.ndb.mysql.com <> | 2007-04-05 10:21:41 +0200 |
|---|---|---|
| committer | tomas@whalegate.ndb.mysql.com <> | 2007-04-05 10:21:41 +0200 |
| commit | d04730c06d28c6b5375965442543878b4d3f9845 (patch) | |
| tree | e05caafa2bdd5cd4a6fe26d00e3a009e33bd6096 /include | |
| parent | b07ef92dda36dfc6d90b46e5786a3344af98dfce (diff) | |
| parent | bc5462fb44edfe7fb930d495215960d898434ab7 (diff) | |
| download | mariadb-git-d04730c06d28c6b5375965442543878b4d3f9845.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_time.h | 2 | ||||
| -rw-r--r-- | include/mysql.h | 2 | ||||
| -rw-r--r-- | include/violite.h | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/include/my_time.h b/include/my_time.h index d96c5822069..6aa25487cf1 100644 --- a/include/my_time.h +++ b/include/my_time.h @@ -72,6 +72,8 @@ typedef long my_time_t; #define TIME_MAX_SECOND 59 #define TIME_MAX_VALUE (TIME_MAX_HOUR*10000 + TIME_MAX_MINUTE*100 + \ TIME_MAX_SECOND) +#define TIME_MAX_VALUE_SECONDS (TIME_MAX_HOUR * 3600L + \ + TIME_MAX_MINUTE * 60L + TIME_MAX_SECOND) my_bool check_date(const MYSQL_TIME *ltime, my_bool not_zero_date, ulong flags, int *was_cut); diff --git a/include/mysql.h b/include/mysql.h index f76ae10ca16..33bdf80ef73 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -525,7 +525,7 @@ MYSQL_RES * STDCALL mysql_list_dbs(MYSQL *mysql,const char *wild); MYSQL_RES * STDCALL mysql_list_tables(MYSQL *mysql,const char *wild); MYSQL_RES * STDCALL mysql_list_processes(MYSQL *mysql); int STDCALL mysql_options(MYSQL *mysql,enum mysql_option option, - const char *arg); + const void *arg); void STDCALL mysql_free_result(MYSQL_RES *result); void STDCALL mysql_data_seek(MYSQL_RES *result, my_ulonglong offset); diff --git a/include/violite.h b/include/violite.h index 2647342ed65..04365213ec0 100644 --- a/include/violite.h +++ b/include/violite.h @@ -102,6 +102,9 @@ void vio_timeout(Vio *vio,uint which, uint timeout); #define HEADER_DES_LOCL_H dummy_something #define YASSL_MYSQL_COMPATIBLE #define YASSL_PREFIX +/* Set yaSSL to use same type as MySQL do for socket handles */ +typedef my_socket YASSL_SOCKET_T; +#define YASSL_SOCKET_T_DEFINED #include <openssl/ssl.h> #include <openssl/err.h> |