diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2018-09-14 20:41:45 +0300 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2018-09-18 19:23:51 +0300 |
| commit | cd3bc80aa2cdcc24b5d422e44005c1cd8114d786 (patch) | |
| tree | fe1de8ac56774475c55298ea54faa1de6ba17579 /main | |
| parent | 5ba72daefa17a63227df5c786594139e6b2edc20 (diff) | |
| download | aports-cd3bc80aa2cdcc24b5d422e44005c1cd8114d786.tar.bz2 aports-cd3bc80aa2cdcc24b5d422e44005c1cd8114d786.tar.xz | |
main/mariadb: work around pthread_detach issue
https://jira.mariadb.org/browse/MDEV-17200
fixes #9407
Diffstat (limited to 'main')
| -rw-r--r-- | main/mariadb/APKBUILD | 6 | ||||
| -rw-r--r-- | main/mariadb/fix-pthread-detach.patch | 11 |
2 files changed, 15 insertions, 2 deletions
diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD index 0e9760e9d8..63c754099e 100644 --- a/main/mariadb/APKBUILD +++ b/main/mariadb/APKBUILD @@ -6,7 +6,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mariadb pkgver=10.3.9 -pkgrel=0 +pkgrel=1 pkgdesc="A fast SQL database server" url="http://www.mariadb.org" pkgusers="mysql" @@ -40,6 +40,7 @@ source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariad $pkgname.initd fix-mysql-install-db-path.patch fix-ucontext-check.patch + fix-pthread-detach.patch ppc-remove-glibc-dep.patch pcre.cmake.patch " @@ -123,7 +124,7 @@ build() { -DPLUGIN_TOKUDB=NO \ -DPLUGIN_AUTH_PAM=NO \ -DPLUGIN_AUTH_GSSAPI=NO \ - -DPLUGIN_AUTH_GSSAPI_CLIENT=NO \ + -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF \ -DPLUGIN_CRACKLIB_PASSWORD_CHECK=NO \ -DWITH_ASAN=OFF \ -DWITH_EMBEDDED_SERVER=ON \ @@ -404,5 +405,6 @@ sha512sums="7c7a678fb0c85da64b6df3df17b8cf7f2ccf862e27dcf8535f7403f8693c76b3b1a9 06751768cb00d2e433655635c38d267ef25084a5830ff40e719ac579223c7192dc34b43f919ab6faf480094632327511cbd22456064dde2d04dc15648b9e3b9f mariadb.initd 0c08198b907dad18c5a7ab89f37ff53da7cb102b0848fb58912900bd92468a0d4f853bc5c0116f655c500d5ed20dcbf20d3884dcd0040634e23c911dfeaf7001 fix-mysql-install-db-path.patch 2d42a3e4051aaeee49da52947dbc354d44d975ca50571777a0aba8bed032ccd6a07c29e0cbb9f74c396dce9937b5d16af19ab310638c285e418e0281361024f3 fix-ucontext-check.patch +b6d3b9a12e8e8c93773d449387400d41b9164bb9295df1a7842b4d11fbce3d823e2078dcbaa3b35f4ca4646841b5f170e635c732c94b76ab526a35a02edbe9aa fix-pthread-detach.patch e9ae4613f1d8c5f0a59b39a3548c46e50674ae78e7457d0e64c49f7e1573125c13634bbce7e29179bb8865a423171f852f43b96f7ef95619a95f02edcfc71efd ppc-remove-glibc-dep.patch 70da971aa78815495098205bcbd28428430aa83c3f1050fec0231ca86af9d9def2d2108a48ee08d86812c8dc5ad8ab1ef4e17a49b4936ed5187ae0f6a7ef8f63 pcre.cmake.patch" diff --git a/main/mariadb/fix-pthread-detach.patch b/main/mariadb/fix-pthread-detach.patch new file mode 100644 index 0000000000..8ac865b0fd --- /dev/null +++ b/main/mariadb/fix-pthread-detach.patch @@ -0,0 +1,11 @@ +--- mariadb-10.3.9/sql/mysqld.cc ++++ mariadb-10.3.9.detach/sql/mysqld.cc +@@ -4842,8 +4842,6 @@ + init_show_explain_psi_keys(); + /* Parameter for threads created for connections */ + (void) pthread_attr_init(&connection_attrib); +- (void) pthread_attr_setdetachstate(&connection_attrib, +- PTHREAD_CREATE_DETACHED); + pthread_attr_setscope(&connection_attrib, PTHREAD_SCOPE_SYSTEM); + + #ifdef HAVE_REPLICATION |