diff -udprN mariadb101-server/Makefile mariadb101-server/Makefile --- mariadb101-server/Makefile 2017-05-01 18:44:27.491707114 +0200 +++ mariadb101-server/Makefile 2017-05-03 17:31:40.369076533 +0200 @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.1.22 -PORTREVISION?= 1 +PORTVERSION= 10.1.23 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ diff -udprN mariadb101-server/distinfo mariadb101-server/distinfo --- mariadb101-server/distinfo 2017-05-01 18:44:27.491707114 +0200 +++ mariadb101-server/distinfo 2017-05-03 17:32:47.483070567 +0200 @@ -1,3 +1,3 @@ TIMESTAMP = 1489523834 -SHA256 (mariadb-10.1.22.tar.gz) = bcb0572e7ad32cea9740a21e9255f733bdf60a5561ffbda317c22dd12b3966ce -SIZE (mariadb-10.1.22.tar.gz) = 61542321 +SHA256 (mariadb-10.1.23.tar.gz) = 54d8114e24bfa5e3ebdc7d69e071ad1471912847ea481b227d204f9d644300bf +SIZE (mariadb-10.1.23.tar.gz) = 61772244 diff -udprN mariadb101-server/files/patch-CMakeLists.txt mariadb101-server/files/patch-CMakeLists.txt --- mariadb101-server/files/patch-CMakeLists.txt 2017-05-01 18:44:27.491707114 +0200 +++ mariadb101-server/files/patch-CMakeLists.txt 2017-05-03 17:45:12.126020261 +0200 @@ -7,7 +7,7 @@ Fix up missing WITHOUT_DOCS, WITHOUT_CLI ) +IF(FALSE) - INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER COPYING.thirdparty + INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.thirdparty EXCEPTIONS-CLIENT COMPONENT Readme) # MDEV-6526 these files are not installed anymore @@ -470,6 +471,7 @@ IF(UNIX) diff -udprN mariadb101-server/files/patch-MDEV-12281 mariadb101-server/files/patch-MDEV-12281 --- mariadb101-server/files/patch-MDEV-12281 1970-01-01 01:00:00.000000000 +0100 +++ mariadb101-server/files/patch-MDEV-12281 2017-05-03 17:30:23.185528302 +0200 @@ -0,0 +1,15 @@ +--- 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