diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-25 14:25:42 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-25 14:25:42 +0300 |
| commit | aeccbbd926e759a5c3b9818d9948a35918404478 (patch) | |
| tree | e3ee68a92d2c77f986979e1638169280ede35a96 /mysys | |
| parent | 75f7c5681c2592b50c26feff2371bd7ee973e535 (diff) | |
| parent | 4b4c2b8cc0da949895292121ed5ef3e0c2dbaae1 (diff) | |
| download | mariadb-git-aeccbbd926e759a5c3b9818d9948a35918404478.tar.gz | |
Merge 10.5 into 10.6
To prevent ASAN heap-use-after-poison in the MDEV-16549 part of
./mtr --repeat=6 main.derived
the initialization of Name_resolution_context was cleaned up.
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 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); |