summaryrefslogtreecommitdiff
path: root/storage/innobase/include/page0page.ic
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-05-03 20:14:09 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-05-03 20:14:09 +0300
commitb6f4cccd191f7d98306db9ebc6e8667ec9e1ec79 (patch)
treef530d85bd1ca8b3cb45f6b6d2b0e1e2ac6b24451 /storage/innobase/include/page0page.ic
parent779fb636daf4c127dbb90f75bab004ac1bbe12df (diff)
parentce195987c3c995470992f16ca7a985796d6b65a6 (diff)
downloadmariadb-git-b6f4cccd191f7d98306db9ebc6e8667ec9e1ec79.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/include/page0page.ic')
-rw-r--r--storage/innobase/include/page0page.ic2
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/innobase/include/page0page.ic b/storage/innobase/include/page0page.ic
index 224e5b08985..4d2be2a0445 100644
--- a/storage/innobase/include/page0page.ic
+++ b/storage/innobase/include/page0page.ic
@@ -173,7 +173,9 @@ page_header_set_field(
{
ut_ad(page);
ut_ad(field <= PAGE_N_RECS);
+#if 0 /* FIXME: MDEV-19344 hits this */
ut_ad(field != PAGE_N_RECS || val);
+#endif
ut_ad(field == PAGE_N_HEAP || val < srv_page_size);
ut_ad(field != PAGE_N_HEAP || (val & 0x7fff) < srv_page_size);