fixup! component/mariadb: version up 10.1.23 with a fix for MDEV-12281.

17204994 · Kazuhiko Shiozaki · 6b74b7e3 · 17204994
Commit 17204994 authored May 09, 2017 by Kazuhiko Shiozaki
Show whitespace changes
Inline Side-by-side

Showing with 20 additions and 3 deletions

component/mariadb/mariadb_10.1.22_MDEV-12281.patch component/mariadb/mariadb_10.1.22_MDEV-12281.patch +20 -3

No files found.
--- a/component/mariadb/mariadb_10.1.22_MDEV-12281.patch
+++ b/component/mariadb/mariadb_10.1.22_MDEV-12281.patch
--- storage/innobase/dict/dict0stats.cc
-+++ storage/innobase/dict/dict0stats.cc
-@@ -1162,10 +1162,10 @@
+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. */