diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2017-05-30 07:56:30 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2017-05-30 07:56:30 +0000 |
| commit | fb0ec2d9f5fb0fee67ca2f0bdd0f64447789d364 (patch) | |
| tree | 092f01e2c2924ab878f3acaed860e96d71fef17f /databases | |
| parent | 78cc949a5c648d970a58780e582395dbcf675426 (diff) | |
| download | ports-fb0ec2d9f5fb0fee67ca2f0bdd0f64447789d364.tar.gz ports-fb0ec2d9f5fb0fee67ca2f0bdd0f64447789d364.zip | |
MFH: r441333
databases/mariadb101-server: Fix crash in XtraDB
- Apply crash patch to XtraDB (not only InnoDB)
- Bump port-revision
PR: 219235
Submitted by: Dani <i.dani@outlook.com>
Approved by: ports-secteam (woodsb02)
Notes
Notes:
svn path=/branches/2017Q2/; revision=442052
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mariadb101-server/Makefile | 2 | ||||
| -rw-r--r-- | databases/mariadb101-server/files/patch-MDEV-12281 | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/databases/mariadb101-server/Makefile b/databases/mariadb101-server/Makefile index 001c826c1c47..baf080db5be4 100644 --- a/databases/mariadb101-server/Makefile +++ b/databases/mariadb101-server/Makefile @@ -2,7 +2,7 @@ PORTNAME?= mariadb PORTVERSION= 10.1.23 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ diff --git a/databases/mariadb101-server/files/patch-MDEV-12281 b/databases/mariadb101-server/files/patch-MDEV-12281 index ffbd1833f294..4f3223cbb8f3 100644 --- a/databases/mariadb101-server/files/patch-MDEV-12281 +++ b/databases/mariadb101-server/files/patch-MDEV-12281 @@ -13,3 +13,18 @@ if (rec_is_last_on_page && !prev_rec_is_copied +--- storage/xtradb/dict/dict0stats.cc.orig 2017-05-02 07:13:52.000000000 +0200 ++++ storage/xtradb/dict/dict0stats.cc 2017-05-08 18:37:24.659231976 +0200 +@@ -1168,10 +1168,10 @@ + leaf-level delete marks because delete marks on + non-leaf level do not make sense. */ + +- if (level == 0 && srv_stats_include_delete_marked? 0: ++ if (level == 0 && (srv_stats_include_delete_marked ? 0: + rec_get_deleted_flag( + rec, +- page_is_comp(btr_pcur_get_page(&pcur)))) { ++ page_is_comp(btr_pcur_get_page(&pcur))))) { + + if (rec_is_last_on_page + && !prev_rec_is_copied |