From owner-svn-ports-all@freebsd.org Sat May 20 20:30:26 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E2F15D76173; Sat, 20 May 2017 20:30:26 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8E6741372; Sat, 20 May 2017 20:30:26 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4KKUP0o001669; Sat, 20 May 2017 20:30:25 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4KKUPxm001667; Sat, 20 May 2017 20:30:25 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201705202030.v4KKUPxm001667@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sat, 20 May 2017 20:30:25 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 May 2017 20:30:27 -0000 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 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