svn commit: r442052 - in branches/2017Q2/databases/mariadb101-server: . files

[Bernard Spil]

Author: brnrd
Date: Tue May 30 07:56:30 2017
New Revision: 442052
URL: https://svnweb.freebsd.org/changeset/ports/442052

Log:
  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 at outlook.com>
  
  Approved by:	ports-secteam (woodsb02)

Modified:
  branches/2017Q2/databases/mariadb101-server/Makefile
  branches/2017Q2/databases/mariadb101-server/files/patch-MDEV-12281
Directory Properties:
  branches/2017Q2/   (props changed)

Modified: branches/2017Q2/databases/mariadb101-server/Makefile
==============================================================================
--- branches/2017Q2/databases/mariadb101-server/Makefile	Tue May 30 07:34:06 2017	(r442051)
+++ branches/2017Q2/databases/mariadb101-server/Makefile	Tue May 30 07:56:30 2017	(r442052)
@@ -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: branches/2017Q2/databases/mariadb101-server/files/patch-MDEV-12281
==============================================================================
--- branches/2017Q2/databases/mariadb101-server/files/patch-MDEV-12281	Tue May 30 07:34:06 2017	(r442051)
+++ branches/2017Q2/databases/mariadb101-server/files/patch-MDEV-12281	Tue May 30 07:56:30 2017	(r442052)
@@ -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