component/mariadb: version up 10.2.4.

component/mariadb/buildout.cfg

@@ -23,14 +23,13 @@ parts =
 
 [mariadb]
 recipe = slapos.recipe.cmmi
-url = https://downloads.mariadb.com/MariaDB/mariadb-10.1.23/source/mariadb-10.1.23.tar.gz
-md5sum = 1a7392cc05c7c249acd4495022719ca8
+url = https://downloads.mariadb.com/MariaDB/mariadb-10.1.24/source/mariadb-10.1.24.tar.gz
+md5sum = e1af4c62e3345b65975f2fa43a0040d2
 patch-options = -p0
 patches =
   ${:_profile_base_location_}/mariadb_10.1.21_create_system_tables__no_test.patch#3c76aa9564a162f13aced7c0a3f783b3
   ${:stable-patches}
 stable-patches =
-  ${:_profile_base_location_}/mariadb_10.1.22_MDEV-12281.patch#b3ab5f92edc72e70619f2442dd82869b
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 configure-command = ${cmake:location}/bin/cmake
 configure-options =

component/mariadb/mariadb_10.1.22_MDEV-12281.patch

-diff -ur storage/innobase/dict/dict0stats.cc storage/innobase/dict/dict0stats.cc
---- storage/innobase/dict/dict0stats.cc	2017-05-02 07:13:44.000000000 +0200
-+++ storage/innobase/dict/dict0stats.cc	2017-05-09 09:53:43.498678672 +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
-diff -ur storage/xtradb/dict/dict0stats.cc storage/xtradb/dict/dict0stats.cc
---- storage/xtradb/dict/dict0stats.cc	2017-05-02 07:13:52.000000000 +0200
-+++ storage/xtradb/dict/dict0stats.cc	2017-05-09 09:53:50.174738190 +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