diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-03-29 21:02:18 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-03-29 21:02:18 +0400 |
| commit | 94d643ac22592e59125214416dac0f5ae42d1260 (patch) | |
| tree | a26a75e7c20fdd34d2cc04edb61e090a5ee7ee56 /include | |
| parent | ab96710bb7c236a74ad912c791173f48d3832c5c (diff) | |
| parent | 0d8dc74d3039753877c174a53b59c5f3d220113b (diff) | |
| download | mariadb-git-94d643ac22592e59125214416dac0f5ae42d1260.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 1 | ||||
| -rw-r--r-- | include/my_pthread.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index e4ca562772e..30db38ce35b 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1071,6 +1071,7 @@ typedef ulong myf; /* Type of MyFlags in my_funcs */ #ifdef _WIN32 #define dlsym(lib, name) (void*)GetProcAddress((HMODULE)lib, name) #define dlopen(libname, unused) LoadLibraryEx(libname, NULL, 0) +#define RTLD_DEFAULT GetModuleHandle(NULL) #define dlclose(lib) FreeLibrary((HMODULE)lib) static inline char *dlerror(void) { diff --git a/include/my_pthread.h b/include/my_pthread.h index a38636af87d..a69e0c49f55 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -673,7 +673,7 @@ extern void my_mutex_end(void); We need to have at least 256K stack to handle calls to myisamchk_init() with the current number of keys and key parts. */ -#define DEFAULT_THREAD_STACK (291*1024L) +#define DEFAULT_THREAD_STACK (292*1024L) #endif #define MY_PTHREAD_LOCK_READ 0 |