summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2022-10-29 19:22:04 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2022-10-29 19:22:04 +0200
commit1ebfa2af62246b98e17cd255a9ccd858151b355a (patch)
treef9cf4670ebe96b46f8e0107acc31f7235ec4c554 /mysys
parentdd9da61dcfd7f5e675ed876cf38886b29d0ddc57 (diff)
parent64143741789a3e1c2bb8c6bf627eaec3751af0c6 (diff)
downloadmariadb-git-1ebfa2af62246b98e17cd255a9ccd858151b355a.tar.gz
Merge branch '10.6' into 10.7
Diffstat (limited to 'mysys')
-rw-r--r--mysys/my_pthread.c1
-rw-r--r--mysys/thr_alarm.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c
index 0e766876792..9bedfe36593 100644
--- a/mysys/my_pthread.c
+++ b/mysys/my_pthread.c
@@ -261,7 +261,6 @@ int sigwait(sigset_t *setp, int *sigp)
pthread_attr_init(&thr_attr);
pthread_attr_setscope(&thr_attr,PTHREAD_SCOPE_PROCESS);
pthread_attr_setdetachstate(&thr_attr,PTHREAD_CREATE_DETACHED);
- pthread_attr_setstacksize(&thr_attr,8196);
pthread_create(&sigwait_thread_id, &thr_attr, sigwait_thread, setp);
pthread_attr_destroy(&thr_attr);
}
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c
index 666f444b51c..b98775e1099 100644
--- a/mysys/thr_alarm.c
+++ b/mysys/thr_alarm.c
@@ -106,7 +106,6 @@ void init_thr_alarm(uint max_alarms)
pthread_attr_init(&thr_attr);
pthread_attr_setscope(&thr_attr,PTHREAD_SCOPE_PROCESS);
pthread_attr_setdetachstate(&thr_attr,PTHREAD_CREATE_DETACHED);
- pthread_attr_setstacksize(&thr_attr,8196);
mysql_thread_create(key_thread_alarm,
&alarm_thread, &thr_attr, alarm_handler, NULL);
pthread_attr_destroy(&thr_attr);