diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-25 11:26:37 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-25 11:26:37 +0300 |
| commit | 9a0b9e336081619d88211d17895e3e7f8030ab3f (patch) | |
| tree | dff672703c5309b1e34227330ea027ab13e6c29a /mysys | |
| parent | 2f7a0072b6f343051fc2dbd77ea46519617b94ab (diff) | |
| parent | 667d3fbbb51044b20d23150992adbbad1f04aad8 (diff) | |
| download | mariadb-git-9a0b9e336081619d88211d17895e3e7f8030ab3f.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_pthread.c | 1 | ||||
| -rw-r--r-- | mysys/thr_alarm.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index c1567f2cd03..36f5081b072 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 92a471075c6..90429f72823 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); |