Attachment #182280 for bug #219045

Lines 1-8 Link Here

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

Lines 1-3 Link Here

(-)mariadb101-server/distinfo (-2 / +2 lines)
1	TIMESTAMP = 1489523834	1	TIMESTAMP = 1489523834
2	SHA256 (mariadb-10.1.22.tar.gz) = bcb0572e7ad32cea9740a21e9255f733bdf60a5561ffbda317c22dd12b3966ce	2	SHA256 (mariadb-10.1.23.tar.gz) = 54d8114e24bfa5e3ebdc7d69e071ad1471912847ea481b227d204f9d644300bf
3	SIZE (mariadb-10.1.22.tar.gz) = 61542321	3	SIZE (mariadb-10.1.23.tar.gz) = 61772244

Lines 7-13 Fix up missing WITHOUT_DOCS, WITHOUT_CLI Link Here

(-)mariadb101-server/files/patch-CMakeLists.txt (-1 / +1 lines)
7	)	7	)
8		8
9	+IF(FALSE)	9	+IF(FALSE)
10	INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER COPYING.thirdparty	10	INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.thirdparty
11	EXCEPTIONS-CLIENT COMPONENT Readme)	11	EXCEPTIONS-CLIENT COMPONENT Readme)
12	# MDEV-6526 these files are not installed anymore	12	# MDEV-6526 these files are not installed anymore
13	@@ -470,6 +471,7 @@ IF(UNIX)	13	@@ -470,6 +471,7 @@ IF(UNIX)




--- storage/innobase/dict/dict0stats.cc.orig	2017-05-02 07:13:44.000000000 +0200
+++ storage/innobase/dict/dict0stats.cc	2017-05-03 17:26:34.159233678 +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 219045

Line 0 Link Here

(-)mariadb101-server/files/patch-MDEV-12281 (+15 lines)
	1	--- storage/innobase/dict/dict0stats.cc.orig 2017-05-02 07:13:44.000000000 +0200
	2	+++ storage/innobase/dict/dict0stats.cc 2017-05-03 17:26:34.159233678 +0200
	3	@@ -1168,10 +1168,10 @@
	4	leaf-level delete marks because delete marks on
	5	non-leaf level do not make sense. */
	6
	7	- if (level == 0 && srv_stats_include_delete_marked? 0:
	8	+ if (level == 0 && (srv_stats_include_delete_marked ? 0:
	9	rec_get_deleted_flag(
	10	rec,
	11	- page_is_comp(btr_pcur_get_page(&pcur)))) {
	12	+ page_is_comp(btr_pcur_get_page(&pcur))))) {
	13
	14	if (rec_is_last_on_page
	15	&& !prev_rec_is_copied