diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-21 15:23:45 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-21 15:23:45 +0300 |
| commit | 32ec5fb979760ba2db52d8afc39e8e090cf80a9c (patch) | |
| tree | 354038721b2f99c9834c31c4a6f3a5fa23c21341 /mysql-test/lib | |
| parent | e8de75db88acdf228237fbebad7f4c8f05e5cc1f (diff) | |
| parent | 9de2e60d7491fcf3cd1f20a4be715ef0bedc316f (diff) | |
| download | mariadb-git-32ec5fb979760ba2db52d8afc39e8e090cf80a9c.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/My/SafeProcess/safe_process.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/lib/My/SafeProcess/safe_process.cc b/mysql-test/lib/My/SafeProcess/safe_process.cc index 9b544a25178..4d0d1e2a3a0 100644 --- a/mysql-test/lib/My/SafeProcess/safe_process.cc +++ b/mysql-test/lib/My/SafeProcess/safe_process.cc @@ -1,4 +1,5 @@ /* Copyright (c) 2008, 2012, Oracle and/or its affiliates + Copyright (c) 2019, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -219,6 +220,7 @@ int main(int argc, char* const argv[] ) sigemptyset(&sa.sa_mask); sa_abort.sa_handler= handle_abort; + sa_abort.sa_flags= 0; sigemptyset(&sa_abort.sa_mask); /* Install signal handlers */ sigaction(SIGTERM, &sa,NULL); |