Date: Sat, 20 May 2017 20:30:25 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r441333 - in head/databases/mariadb101-server: . files Message-ID: <201705202030.v4KKUPxm001667@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Sat May 20 20:30:25 2017 New Revision: 441333 URL: https://svnweb.freebsd.org/changeset/ports/441333 Log: 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> Modified: head/databases/mariadb101-server/Makefile head/databases/mariadb101-server/files/patch-MDEV-12281 Modified: head/databases/mariadb101-server/Makefile ============================================================================== --- head/databases/mariadb101-server/Makefile Sat May 20 19:50:34 2017 (r441332) +++ head/databases/mariadb101-server/Makefile Sat May 20 20:30:25 2017 (r441333) @@ -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}/ \ Modified: head/databases/mariadb101-server/files/patch-MDEV-12281 ============================================================================== --- head/databases/mariadb101-server/files/patch-MDEV-12281 Sat May 20 19:50:34 2017 (r441332) +++ head/databases/mariadb101-server/files/patch-MDEV-12281 Sat May 20 20:30:25 2017 (r441333) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705202030.v4KKUPxm001667>