diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-30 14:50:23 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-30 14:50:23 +0300 |
| commit | e2f1f88fa60680cb87833a7cceb172f5d436a804 (patch) | |
| tree | 5e48f8ed5c7a169af6692c72de9f1007af48737e /include/my_pthread.h | |
| parent | 9eae063e79376fd71586e1106e750a366467a984 (diff) | |
| parent | b092d35f13ceae37cda26478635b127f9b401e2c (diff) | |
| download | mariadb-git-e2f1f88fa60680cb87833a7cceb172f5d436a804.tar.gz | |
Merge 10.3 into 10.4
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 1b35d0fdd0d..eeee0c387cb 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 @@ -705,7 +705,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 */ |