diff options
| author | unknown <ingo@mysql.com> | 2005-12-14 18:20:19 +0100 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-12-14 18:20:19 +0100 |
| commit | 6e328f92de94cc17ce6ab5a93e4b8dfed4e88d69 (patch) | |
| tree | c6a44d352e35e14295661c43bcbc659f39e9fc58 /include | |
| parent | 7826edd4957fb5c5663223eaecdeef2a55d4bca3 (diff) | |
| parent | 9a3cc2827c891e1466dcc8127d76fa9576babc61 (diff) | |
| download | mariadb-git-6e328f92de94cc17ce6ab5a93e4b8dfed4e88d69.tar.gz | |
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/nfstmp1/ingo/autopush-775/mysql-5.0
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 5 | ||||
| -rw-r--r-- | include/my_pthread.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/config-win.h b/include/config-win.h index edfb4ecc5c7..528bc8a8cdd 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -325,6 +325,11 @@ inline double ulonglong2double(ulonglong value) #define HAVE_SETFILEPOINTER #define HAVE_VIO_READ_BUFF +#ifndef __NT__ +#undef FILE_SHARE_DELETE +#define FILE_SHARE_DELETE 0 /* Not implemented on Win 98/ME */ +#endif + #ifdef NOT_USED #define HAVE_SNPRINTF /* Gave link error */ #define _snprintf snprintf diff --git a/include/my_pthread.h b/include/my_pthread.h index 6f60a6df2c1..202e047dc4e 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -643,10 +643,10 @@ extern int pthread_dummy(int); #define THREAD_NAME_SIZE 10 #ifndef DEFAULT_THREAD_STACK -#if defined(__ia64__) +#if SIZEOF_CHARP > 4 /* MySQL can survive with 32K, but some glibc libraries require > 128K stack - To resolve hostnames + To resolve hostnames. Also recursive stored procedures needs stack. */ #define DEFAULT_THREAD_STACK (256*1024L) #else |