diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-netware.h | 2 | ||||
| -rw-r--r-- | include/config-win.h | 13 | ||||
| -rw-r--r-- | include/my_base.h | 3 | ||||
| -rw-r--r-- | include/my_sys.h | 2 | ||||
| -rw-r--r-- | include/violite.h | 10 |
5 files changed, 16 insertions, 14 deletions
diff --git a/include/config-netware.h b/include/config-netware.h index 85a5ef86829..b0cf7986451 100644 --- a/include/config-netware.h +++ b/include/config-netware.h @@ -110,7 +110,7 @@ extern "C" { #define DEFAULT_BASEDIR "sys:/" #define SHAREDIR "share/" #define DEFAULT_CHARSET_HOME "sys:/mysql/" -#define DATADIR "data/" +#define MYSQL_DATADIR "data/" /* 64-bit file system calls */ #define SIZEOF_OFF_T 8 diff --git a/include/config-win.h b/include/config-win.h index ab463a7c142..84705809d7a 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -15,15 +15,6 @@ /* Defines for Win32 to make it compatible for MySQL */ -#ifdef __WIN2000__ -/* We have to do this define before including windows.h to get the AWE API -functions */ -#define _WIN32_WINNT 0x0500 -#else -/* Get NT 4.0 functions */ -#define _WIN32_WINNT 0x0400 -#endif - #if defined(_MSC_VER) && _MSC_VER >= 1400 /* Avoid endless warnings about sprintf() etc. being unsafe. */ #define _CRT_SECURE_NO_DEPRECATE 1 @@ -312,13 +303,15 @@ inline ulonglong double2ulonglong(double d) #ifdef _CUSTOMCONFIG_ #include <custom_conf.h> #else +#ifndef CMAKE_CONFIGD #define DEFAULT_MYSQL_HOME "c:\\mysql" -#define DATADIR "c:\\mysql\\data" +#define MYSQL_DATADIR "c:\\mysql\\data" #define PACKAGE "mysql" #define DEFAULT_BASEDIR "C:\\" #define SHAREDIR "share" #define DEFAULT_CHARSET_HOME "C:/mysql/" #endif +#endif #ifndef DEFAULT_HOME_ENV #define DEFAULT_HOME_ENV MYSQL_HOME #endif diff --git a/include/my_base.h b/include/my_base.h index e45a73d68ed..181824012d9 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -377,9 +377,10 @@ enum ha_base_keytype { #define HA_ERR_TABLE_READONLY 161 /* The table is not writable */ #define HA_ERR_AUTOINC_READ_FAILED 162/* Failed to get the next autoinc value */ #define HA_ERR_AUTOINC_ERANGE 163 /* Failed to set the row autoinc value */ +#define HA_ERR_TOO_MANY_CONCURRENT_TRXS 164 /*Too many active concurrent transactions */ /* You must also add numbers and description to extra/perror.c ! */ -#define HA_ERR_LAST 163 /*Copy last error nr.*/ +#define HA_ERR_LAST 164 /*Copy last error nr.*/ /* Add error numbers before HA_ERR_LAST and change it accordingly. */ #define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1) diff --git a/include/my_sys.h b/include/my_sys.h index bfb1a672641..4254ec3dbcb 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -512,7 +512,7 @@ typedef int (*qsort2_cmp)(const void *, const void *, const void *); ((info)->write_pos + (Count) <=(info)->write_end ?\ (memcpy((info)->write_pos, (Buffer), (size_t)(Count)),\ ((info)->write_pos+=(Count)),0) : \ - (*(info)->write_function)((info),(Buffer),(Count))) + (*(info)->write_function)((info),(Buffer), (uint)(Count))) #define my_b_get(info) \ ((info)->read_pos != (info)->read_end ?\ diff --git a/include/violite.h b/include/violite.h index 7b57667541a..b04fe108314 100644 --- a/include/violite.h +++ b/include/violite.h @@ -109,6 +109,14 @@ typedef my_socket YASSL_SOCKET_T; #include <openssl/ssl.h> #include <openssl/err.h> +enum enum_ssl_init_error +{ + SSL_INITERR_NOERROR= 0, SSL_INITERR_CERT, SSL_INITERR_KEY, + SSL_INITERR_NOMATCH, SSL_INITERR_BAD_PATHS, SSL_INITERR_CIPHERS, + SSL_INITERR_MEMFAIL, SSL_INITERR_LASTERR +}; +const char* sslGetErrString(enum enum_ssl_init_error err); + struct st_VioSSLFd { SSL_CTX *ssl_context; @@ -124,7 +132,7 @@ struct st_VioSSLFd struct st_VioSSLFd *new_VioSSLAcceptorFd(const char *key_file, const char *cert_file, const char *ca_file,const char *ca_path, - const char *cipher); + const char *cipher, enum enum_ssl_init_error* error); #endif /* HAVE_OPENSSL */ #ifdef HAVE_SMEM |