aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Spil <brnrd@FreeBSD.org>2017-05-20 20:30:25 +0000
committerBernard Spil <brnrd@FreeBSD.org>2017-05-20 20:30:25 +0000
commit94d3ae04353c793196610562933f546836430a57 (patch)
tree504049c178b0b3f8f85afc26caded2c76b7fd393
parente31af7033712faef2a3943c69a11b4444388962d (diff)
downloadports-94d3ae04353c793196610562933f546836430a57.tar.gz
ports-94d3ae04353c793196610562933f546836430a57.zip
Notes
-rw-r--r--databases/mariadb101-server/Makefile2
-rw-r--r--databases/mariadb101-server/files/patch-MDEV-1228115
2 files changed, 16 insertions, 1 deletions
diff --git a/databases/mariadb101-server/Makefile b/databases/mariadb101-server/Makefile
index b304324fd0da..bba9e4f1d97a 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