Attachment #182541 for bug #219235

View | Details | Raw Unified | Return to bug 219235
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2		2
3	PORTNAME?= mariadb	3	PORTNAME?= mariadb
4	PORTVERSION= 10.1.23	4	PORTVERSION= 10.1.23
5	PORTREVISION?= 0	5	PORTREVISION?= 1
6	CATEGORIES= databases ipv6	6	CATEGORIES= databases ipv6
7	MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \	7	MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \
8	http://mirrors.supportex.net/${SITESDIR}/ \	8	http://mirrors.supportex.net/${SITESDIR}/ \




 
 			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

Return to bug 219235

Lines 13-15 Link Here

(-)files/patch-MDEV-12281 (+15 lines)
13		13
14	if (rec_is_last_on_page	14	if (rec_is_last_on_page
15	&& !prev_rec_is_copied	15	&& !prev_rec_is_copied
		16	--- storage/xtradb/dict/dict0stats.cc.orig 2017-05-02 07:13:52.000000000 +0200
		17	+++ storage/xtradb/dict/dict0stats.cc 2017-05-08 18:37:24.659231976 +0200
		18	@@ -1168,10 +1168,10 @@
		19	leaf-level delete marks because delete marks on
		20	non-leaf level do not make sense. */
		21
		22	- if (level == 0 && srv_stats_include_delete_marked? 0:
		23	+ if (level == 0 && (srv_stats_include_delete_marked ? 0:
		24	rec_get_deleted_flag(
		25	rec,
		26	- page_is_comp(btr_pcur_get_page(&pcur)))) {
		27	+ page_is_comp(btr_pcur_get_page(&pcur))))) {
		28
		29	if (rec_is_last_on_page
		30	&& !prev_rec_is_copied