diff --git a/include/my_pthread.h b/include/my_pthread.h
index ae2f912f979..2b3edb73528 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -734,7 +734,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	(289*1024L)
+#ifdef __SANITIZE_ADDRESS__
+#define DEFAULT_THREAD_STACK	(364*1024L)
+#else
+#define DEFAULT_THREAD_STACK	(292*1024L)
+#endif
 #endif
 
 #define MY_PTHREAD_LOCK_READ 0
diff --git a/mysql-test/r/mysqld--help,win.rdiff b/mysql-test/r/mysqld--help,win.rdiff
index 6e18d16feaf..128155870b8 100644
--- a/mysql-test/r/mysqld--help,win.rdiff
+++ b/mysql-test/r/mysqld--help,win.rdiff
@@ -133,6 +133,6 @@
 -thread-pool-oversubscribe 3
 -thread-pool-stall-limit 500
 +thread-pool-min-threads 1
- thread-stack 295936
+ thread-stack 299008
  time-format %H:%i:%s
  timed-mutexes FALSE
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
index fdb4d8c280d..4ff44dcd251 100644
--- a/mysql-test/r/mysqld--help.result
+++ b/mysql-test/r/mysqld--help.result
@@ -1449,7 +1449,7 @@ thread-pool-idle-timeout 60
 thread-pool-max-threads 1000
 thread-pool-oversubscribe 3
 thread-pool-stall-limit 500
-thread-stack 295936
+thread-stack 299008
 time-format %H:%i:%s
 timed-mutexes FALSE
 tmp-table-size 16777216
diff --git a/mysql-test/suite/sys_vars/inc/sysvars_server.inc b/mysql-test/suite/sys_vars/inc/sysvars_server.inc
index cb06b40f8c9..cffc7e7fa62 100644
--- a/mysql-test/suite/sys_vars/inc/sysvars_server.inc
+++ b/mysql-test/suite/sys_vars/inc/sysvars_server.inc
@@ -12,7 +12,7 @@ set sql_mode=ansi_quotes;
 set global div_precision_increment=5;
 
 --replace_regex /^\/\S+/PATH/
---replace_result $MASTER_MYPORT MASTER_MYPORT
+--replace_result $MASTER_MYPORT MASTER_MYPORT 372736 299008
 select * from information_schema.system_variables
   where variable_name not like 'aria%' and
         variable_name not like 'debug%' and
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
index 4da76bdaec1..9ca6995d7ef 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
@@ -3917,9 +3917,9 @@ READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	THREAD_STACK
 SESSION_VALUE	NULL
-GLOBAL_VALUE	295936
+GLOBAL_VALUE	299008
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	295936
+DEFAULT_VALUE	299008
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
 VARIABLE_COMMENT	The stack size for each thread
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
index 3e34bfce8f9..9288912eb57 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
@@ -4687,9 +4687,9 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	THREAD_STACK
 SESSION_VALUE	NULL
-GLOBAL_VALUE	295936
+GLOBAL_VALUE	299008
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	295936
+DEFAULT_VALUE	299008
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
 VARIABLE_COMMENT	The stack size for each thread
diff --git a/mysql-test/suite/sys_vars/r/thread_stack_basic.result b/mysql-test/suite/sys_vars/r/thread_stack_basic.result
index d5a30bbaf6e..5be5db5626c 100644
--- a/mysql-test/suite/sys_vars/r/thread_stack_basic.result
+++ b/mysql-test/suite/sys_vars/r/thread_stack_basic.result
@@ -1,20 +1,20 @@
 select @@global.thread_stack;
 @@global.thread_stack
-295936
+299008
 select @@session.thread_stack;
 ERROR HY000: Variable 'thread_stack' is a GLOBAL variable
 show global variables like 'thread_stack';
 Variable_name	Value
-thread_stack	295936
+thread_stack	299008
 show session variables like 'thread_stack';
 Variable_name	Value
-thread_stack	295936
+thread_stack	299008
 select * from information_schema.global_variables where variable_name='thread_stack';
 VARIABLE_NAME	VARIABLE_VALUE
-THREAD_STACK	295936
+THREAD_STACK	299008
 select * from information_schema.session_variables where variable_name='thread_stack';
 VARIABLE_NAME	VARIABLE_VALUE
-THREAD_STACK	295936
+THREAD_STACK	299008
 set global thread_stack=1;
 ERROR HY000: Variable 'thread_stack' is a read only variable
 set session thread_stack=1;
diff --git a/mysql-test/suite/sys_vars/t/thread_stack_basic.test b/mysql-test/suite/sys_vars/t/thread_stack_basic.test
index 2d4d144572d..bfd3fb40db3 100644
--- a/mysql-test/suite/sys_vars/t/thread_stack_basic.test
+++ b/mysql-test/suite/sys_vars/t/thread_stack_basic.test
@@ -1,17 +1,17 @@
 #
 # only global
 #
---replace_result 196608 262144
+--replace_result 372736 299008
 select @@global.thread_stack;
 --error ER_INCORRECT_GLOBAL_LOCAL_VAR
 select @@session.thread_stack;
---replace_result 196608 262144
+--replace_result 372736 299008
 show global variables like 'thread_stack';
---replace_result 196608 262144
+--replace_result 372736 299008
 show session variables like 'thread_stack';
---replace_result 196608 262144
+--replace_result 372736 299008
 select * from information_schema.global_variables where variable_name='thread_stack';
---replace_result 196608 262144
+--replace_result 372736 299008
 select * from information_schema.session_variables where variable_name='thread_stack';
 
 #
diff --git a/mysql-test/t/mysqld--help.test b/mysql-test/t/mysqld--help.test
index 3fb924b9199..8b4674c140c 100644
--- a/mysql-test/t/mysqld--help.test
+++ b/mysql-test/t/mysqld--help.test
@@ -57,7 +57,7 @@ perl;
     # fixes for 32-bit
     s/\b4294967295\b/18446744073709551615/;
     s/\b2146435072\b/9223372036853727232/;
-    s/\b196608\b/262144/;
+    s/\b372736\b/299008/;
     s/\b4294963200\b/18446744073709547520/;
     foreach $var (@env) { s/\Q$ENV{$var}\E/$var/ }
     next if /use --skip-(use-)?symbolic-links to disable/; # for valgrind, again