* Merge

--HG--
branch : trunk

1 files changed, 295 insertions, 0 deletions

diff --git a/externals/mysql/my_config.h b/externals/mysql/my_config.h
new file mode 100644
index 00000000000..adea8dbe8ea
--- /dev/null
+++ b/externals/mysql/my_config.h
@@ -0,0 +1,295 @@
+
+/* Headers we may want to use. */
+/* #undef HAVE_ALLOCA_H */
+/* #undef HAVE_ARPA_INET_H */
+/* #undef HAVE_CRYPT_H */
+/* #undef HAVE_DIRENT_H */
+/* #undef HAVE_EXECINFO_H */
+#define HAVE_FCNTL_H 1
+/* #undef HAVE_FENV_H */
+#define HAVE_FLOAT_H 1
+/* #undef HAVE_FPU_CONTROL_H */
+/* #undef HAVE_GRP_H */
+/* #undef HAVE_IEEEFP_H */
+#define HAVE_LIMITS_H 1
+#define HAVE_MALLOC_H 1
+#define HAVE_MEMORY_H 1
+/* #undef HAVE_NETINET_IN_H */
+/* #undef HAVE_PATHS_H */
+/* #undef HAVE_PWD_H */
+/* #undef HAVE_SCHED_H */
+/* #undef HAVE_SELECT_H */
+#define HAVE_STDDEF_H 1
+#define HAVE_STDLIB_H 1
+/* #undef HAVE_STRINGS_H */
+#define HAVE_STRING_H 1
+/* #undef HAVE_SYNCH_H */
+/* #undef HAVE_SYSENT_H */
+/* #undef HAVE_SYS_FPU_H */
+/* #undef HAVE_SYS_IOCTL_H */
+/* #undef HAVE_SYS_IPC_H */
+/* #undef HAVE_SYS_MMAN_H */
+/* #undef HAVE_SYS_PRCTL_H */
+/* #undef HAVE_SYS_SELECT_H */
+/* #undef HAVE_SYS_SHM_H */
+/* #undef HAVE_SYS_SOCKET_H */
+#define HAVE_SYS_STAT_H 1
+/* #undef HAVE_SYS_STREAM_H */
+#define HAVE_SYS_TIMEB_H 1
+#define HAVE_SYS_TYPES_H 1
+/* #undef HAVE_SYS_UN_H */
+/* #undef HAVE_TERMIOS_H */
+/* #undef HAVE_TERMIO_H */
+/* #undef HAVE_UNISTD_H */
+/* #undef HAVE_UTIME_H */
+
+/* Functions we may want to use. */
+#define HAVE_ACCESS 1
+/* #undef HAVE_AIOWAIT */
+/* #undef HAVE_ALARM */
+/* #undef HAVE_ALLOCA */
+/* #undef HAVE_BCMP */
+/* #undef HAVE_BFILL */
+/* #undef HAVE_BMOVE */
+/* #undef HAVE_BZERO */
+/* #undef HAVE_CLOCK_GETTIME */
+/* #undef HAVE_COMPRESS */
+/* #undef HAVE_CRYPT */
+/* #undef HAVE_DLERROR */
+/* #undef HAVE_DLOPEN */
+/* #undef HAVE_FCHMOD */
+/* #undef HAVE_FCNTL */
+/* #undef HAVE_FCONVERT */
+/* #undef HAVE_FDATASYNC */
+/* #undef HAVE_FESETROUND */
+/* #undef HAVE_FINITE */
+/* #undef HAVE_FP_EXCEPT */
+/* #undef HAVE_FSEEKO */
+/* #undef HAVE_FSYNC */
+/* #undef HAVE_GETADDRINFO */
+#define HAVE_GETCWD 1
+/* #undef HAVE_GETHOSTBYADDR_R */
+/* #undef HAVE_GETHOSTBYNAME_R */
+/* #undef HAVE_GETHRTIME */
+/* #undef HAVE_GETNAMEINFO */
+/* #undef HAVE_GETPAGESIZE */
+/* #undef HAVE_GETPASS */
+/* #undef HAVE_GETPASSPHRASE */
+/* #undef HAVE_GETPWNAM */
+/* #undef HAVE_GETPWUID */
+/* #undef HAVE_GETRLIMIT */
+/* #undef HAVE_GETRUSAGE */
+/* #undef HAVE_GETWD */
+/* #undef HAVE_GMTIME_R */
+/* #undef HAVE_INITGROUPS */
+/* #undef HAVE_ISNAN */
+#define HAVE_LDIV 1
+/* #undef HAVE_LOCALTIME_R */
+/* #undef HAVE_LOG2 */
+#define HAVE_LONGJMP 1
+/* #undef HAVE_LSTAT */
+/* #undef HAVE_MADVISE */
+/* #undef HAVE_DECL_MADVISE */
+/* #undef HAVE_MALLINFO */
+#define HAVE_MEMCPY 1
+#define HAVE_MEMCPY 1
+#define HAVE_MEMMOVE 1
+#define HAVE_MEMMOVE 1
+/* #undef HAVE_MKSTEMP */
+/* #undef HAVE_MLOCK */
+/* #undef HAVE_MLOCKALL */
+/* #undef HAVE_MMAP */
+/* #undef HAVE_MMAP64 */
+#define HAVE_PERROR 1
+/* #undef HAVE_POLL */
+/* #undef HAVE_PREAD */
+/* #undef HAVE_PTHREAD_ATTR_CREATE */
+/* #undef HAVE_PTHREAD_ATTR_GETSTACKSIZE */
+/* #undef HAVE_PTHREAD_ATTR_SETPRIO */
+/* #undef HAVE_PTHREAD_ATTR_SETSCHEDPARAM */
+/* #undef HAVE_PTHREAD_ATTR_SETSCOPE */
+/* #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE */
+/* #undef HAVE_PTHREAD_CONDATTR_CREATE */
+/* #undef HAVE_PTHREAD_INIT */
+/* #undef HAVE_PTHREAD_KEY_DELETE */
+/* #undef HAVE_PTHREAD_KEY_DELETE */
+/* #undef HAVE_PTHREAD_KILL */
+/* #undef HAVE_PTHREAD_RWLOCK_RDLOCK */
+/* #undef HAVE_PTHREAD_SETPRIO_NP */
+/* #undef HAVE_PTHREAD_SETSCHEDPARAM */
+/* #undef HAVE_PTHREAD_SIGMASK */
+/* #undef HAVE_PTHREAD_THREADMASK */
+/* #undef HAVE_PTHREAD_YIELD_NP */
+/* #undef HAVE_READDIR_R */
+/* #undef HAVE_READLINK */
+/* #undef HAVE_REALPATH */
+#define HAVE_RENAME 1
+/* #undef HAVE_RINT */
+/* #undef HAVE_SCHED_YIELD */
+/* #undef HAVE_SELECT */
+/* #undef HAVE_SETFD */
+/* #undef HAVE_SETFILEPOINTER */
+/* #undef HAVE_SIGACTION */
+/* #undef HAVE_SIGTHREADMASK */
+/* #undef HAVE_SIGWAIT */
+/* #undef HAVE_SLEEP */
+/* #undef HAVE_SNPRINTF */
+/* #undef HAVE_STPCPY */
+#define HAVE_STRERROR 1
+/* #undef HAVE_STRLCPY */
+#define HAVE_STRNLEN 1
+#define HAVE_STRPBRK 1
+/* #undef HAVE_STRSEP */
+#define HAVE_STRSTR 1
+/* #undef HAVE_STRTOK_R */
+/* #undef HAVE_STRTOK_R */
+#define HAVE_STRTOL 1
+/* #undef HAVE_STRTOLL */
+#define HAVE_STRTOUL 1
+/* #undef HAVE_STRTOULL */
+#define HAVE_TELL 1
+/* #undef HAVE_THR_SETCONCURRENCY */
+/* #undef HAVE_THR_YIELD */
+/* #undef HAVE_VASPRINTF */
+#define HAVE_VSNPRINTF 1
+
+/* Symbols we may use */
+/* #undef HAVE_SYS_ERRLIST */
+/* used by stacktrace functions */
+/* #undef HAVE_BSS_START */
+
+/* Does "struct timespec" have a "sec" and "nsec" field? */
+/* #undef HAVE_TIMESPEC_TS_SEC */
+
+/* Types we may use */
+#define SIZEOF_CHAR 1
+#if SIZEOF_CHAR
+# define HAVE_CHAR 1
+#endif
+
+#define SIZEOF_CHARP 4
+#if SIZEOF_CHARP
+# define HAVE_CHARP 1
+#endif
+
+#define SIZEOF_SHORT 2
+#if SIZEOF_SHORT
+# define HAVE_SHORT 1
+#endif
+
+#define SIZEOF_INT 4
+#if SIZEOF_INT
+# define HAVE_INT 1
+#endif
+
+#define SIZEOF_LONG 4
+#if SIZEOF_LONG
+# define HAVE_LONG 1
+#endif
+
+#define SIZEOF_LONG_LONG 8
+#if SIZEOF_LONG_LONG
+# define HAVE_LONG_LONG 1
+#endif
+
+#define SIZEOF_OFF_T 4
+#if SIZEOF_OFF_T
+# define HAVE_OFF_T 1
+#endif
+
+/* #undef SIZEOF_SIGSET_T */
+#if SIZEOF_SIGSET_T
+# define HAVE_SIGSET_T 1
+#endif
+
+#define SIZEOF_SIZE_T 4
+#if SIZEOF_SIZE_T
+# define HAVE_SIZE_T 1
+#endif
+
+/* #undef SIZEOF_UCHAR */
+#if SIZEOF_UCHAR
+# define HAVE_UCHAR 1
+#endif
+
+/* #undef SIZEOF_UINT */
+#if SIZEOF_UINT
+# define HAVE_UINT 1
+#endif
+
+/* #undef SIZEOF_ULONG */
+#if SIZEOF_ULONG
+# define HAVE_ULONG 1
+#endif
+
+/* #undef SIZEOF_INT8 */
+#if SIZEOF_INT8
+# define HAVE_INT8 1
+#endif
+/* #undef SIZEOF_UINT8 */
+#if SIZEOF_UINT8
+# define HAVE_UINT8 1
+#endif
+
+/* #undef SIZEOF_INT16 */
+#if SIZEOF_INT16
+# define HAVE_INT16 1
+#endif
+/* #undef SIZEOF_UINT16 */
+#if SIZEOF_UINT16
+# define HAVE_UINT16 1
+#endif
+
+/* #undef SIZEOF_INT32 */
+#if SIZEOF_INT32
+# define HAVE_INT32 1
+#endif
+/* #undef SIZEOF_UINT32 */
+#if SIZEOF_UINT32
+# define HAVE_UINT32 1
+#endif
+/* #undef SIZEOF_U_INT32_T */
+#if SIZEOF_U_INT32_T
+# define HAVE_U_INT32_T 1
+#endif
+
+/* #undef SIZEOF_INT64 */
+#if SIZEOF_INT64
+# define HAVE_INT64 1
+#endif
+/* #undef SIZEOF_UINT64 */
+#if SIZEOF_UINT64
+# define HAVE_UINT64 1
+#endif
+
+/* #undef SIZEOF_SOCKLEN_T */
+#if SIZEOF_SOCKLEN_T
+# define HAVE_SOCKLEN_T 1
+#endif
+
+/* XXX mysql_client_test uses this -- rip it out, please! */
+#define MAX_INDEXES 64
+
+#define QSORT_TYPE_IS_VOID 1
+#define RETQSORTTYPE void
+
+#define SIGNAL_RETURN_TYPE_IS_VOID 1
+#define RETSIGTYPE void
+
+/* #undef WORDS_BIGENDIAN */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler calls
+   it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+# define inline 
+#endif
+
+#define TIME_WITH_SYS_TIME 1
+
+#define STACK_DIRECTION -1
+
+#define SHAREDIR "share"
+#define THREAD 1
+#define THREAD_SAFE_CLIENT 1
+
+#define DEFAULT_CHARSET_HOME "C:/mysql/"