summaryrefslogtreecommitdiff
path: root/include/my_pthread.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-03-08 00:26:55 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-03-08 00:26:55 +0200
commit2d0dd62cf7e824f5bbc8d0367730adcdaf0eed68 (patch)
tree804b14fb55650c3af866d8bc19048594569e7f98 /include/my_pthread.h
parentd30f17af4969cc1ce34f1925f5ea2bced9c6f7e9 (diff)
parentbf71d263621c90cbddc7bde9bf071dae503f333f (diff)
downloadmariadb-git-2d0dd62cf7e824f5bbc8d0367730adcdaf0eed68.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'include/my_pthread.h')
-rw-r--r--include/my_pthread.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h
index 2712c7d8ffd..302d4e95cea 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -691,8 +691,12 @@ 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__
+#define DEFAULT_THREAD_STACK (364*1024L)
+#else
#define DEFAULT_THREAD_STACK (292*1024L)
#endif
+#endif
#define MY_PTHREAD_LOCK_READ 0
#define MY_PTHREAD_LOCK_WRITE 1