diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-08 11:19:48 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-08 11:19:48 +0200 |
| commit | c67b306e4f90788b979bf85f5a2ab282798fc897 (patch) | |
| tree | b7fa51ab7bacbf5ed8c20367f009625a7da0f95b /include | |
| parent | 91d7e7b244be2ebf39eb135bacea99ed19657475 (diff) | |
| parent | 94eb56fb29334a1075103becb625685b23f7d437 (diff) | |
| download | mariadb-git-c67b306e4f90788b979bf85f5a2ab282798fc897.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 843701ccab9..4d33d1abdd4 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2014, Oracle and/or its affiliates. - Copyright (c) 2009, 2017, MariaDB Corporation. + Copyright (c) 2009, 2019, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -703,7 +703,11 @@ 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 (292*1024L) +#ifdef __SANITIZE_ADDRESS__ +#define DEFAULT_THREAD_STACK (383*1024L) /* 392192 */ +#else +#define DEFAULT_THREAD_STACK (292*1024L) /* 299008 */ +#endif #endif #define MY_PTHREAD_LOCK_READ 0 |