diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-03-29 07:24:05 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-03-29 07:24:05 +0400 |
| commit | fb43180c4f46bccaee054524ff532dea4bef41d4 (patch) | |
| tree | 7d53d19866b749debb71b7d4979800ecbef44bdd /include | |
| parent | 48c59f394bb9bd4dfd34be19ff4cf933557eb017 (diff) | |
| parent | c5520a37d6111991157d8da91b1ae4b9e7cbf50c (diff) | |
| download | mariadb-git-fb43180c4f46bccaee054524ff532dea4bef41d4.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
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 |