diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-07 17:50:13 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-07 17:52:27 +0200 |
| commit | 913e33e423b434712a9d708cd0f0244d2f03cb0b (patch) | |
| tree | 6f276c6426bd91a8b7f35614a20ddfa2df89b213 /include | |
| parent | 2faefe5f7f432f8d9b3435dd8f4e2a37163c5527 (diff) | |
| parent | e3adf96aeb39ad43143ca2a9c7a2f23d06e8e26b (diff) | |
| download | mariadb-git-913e33e423b434712a9d708cd0f0244d2f03cb0b.tar.gz | |
Merge 10.1 into 10.2
Rewrite the MDEV-13818 fix to prevent heap-use-after-free.
Add a test case for MDEV-18272.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 0504a5f3272..dfd479fed36 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -693,8 +693,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 |