diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-30 18:52:17 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-30 19:07:25 +0300 |
| commit | 37c14690fc6bc9237bdad9b8e26157d1174a49fc (patch) | |
| tree | 490ab3103b3f2dbef654fdd860e891ccde87d93c /include/my_pthread.h | |
| parent | aae3f921adec9b9d1bff093c9a75a94e44f5c8d4 (diff) | |
| parent | e2f1f88fa60680cb87833a7cceb172f5d436a804 (diff) | |
| download | mariadb-git-37c14690fc6bc9237bdad9b8e26157d1174a49fc.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'include/my_pthread.h')
| -rw-r--r-- | include/my_pthread.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 0d9b9d61616..175731a7b0b 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, 2019, MariaDB Corporation. + Copyright (c) 2009, 2020, 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 @@ -684,7 +684,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. */ -#ifdef __SANITIZE_ADDRESS__ +#if defined(__SANITIZE_ADDRESS__) || defined(WITH_UBSAN) #define DEFAULT_THREAD_STACK (383*1024L) /* 392192 */ #else #define DEFAULT_THREAD_STACK (292*1024L) /* 299008 */ |