Skip to content

Commit 492c1e4

Browse files
committed
Fix an incorrect debug assertion
1 parent b8187fd commit 492c1e4

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

storage/innobase/include/page0zip.ic

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
Copyright (c) 2005, 2013, Oracle and/or its affiliates. All Rights Reserved.
44
Copyright (c) 2012, Facebook Inc.
5+
Copyright (c) 2017, MariaDB Corporation.
56

67
This program is free software; you can redistribute it and/or modify it under
78
the terms of the GNU General Public License as published by the Free Software
@@ -172,7 +173,8 @@ page_zip_rec_needs_ext(
172173
ignored if zip_size == 0 */
173174
ulint zip_size) /*!< in: compressed page size in bytes, or 0 */
174175
{
175-
ut_ad(rec_size > comp ? REC_N_NEW_EXTRA_BYTES : REC_N_OLD_EXTRA_BYTES);
176+
ut_ad(rec_size
177+
> (comp ? REC_N_NEW_EXTRA_BYTES : REC_N_OLD_EXTRA_BYTES));
176178
ut_ad(ut_is_2pow(zip_size));
177179
ut_ad(comp || !zip_size);
178180

storage/xtradb/include/page0zip.ic

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
Copyright (c) 2005, 2013, Oracle and/or its affiliates. All Rights Reserved.
44
Copyright (c) 2012, Facebook Inc.
5+
Copyright (c) 2017, MariaDB Corporation.
56

67
This program is free software; you can redistribute it and/or modify it under
78
the terms of the GNU General Public License as published by the Free Software
@@ -172,7 +173,8 @@ page_zip_rec_needs_ext(
172173
ignored if zip_size == 0 */
173174
ulint zip_size) /*!< in: compressed page size in bytes, or 0 */
174175
{
175-
ut_ad(rec_size > comp ? REC_N_NEW_EXTRA_BYTES : REC_N_OLD_EXTRA_BYTES);
176+
ut_ad(rec_size
177+
> (comp ? REC_N_NEW_EXTRA_BYTES : REC_N_OLD_EXTRA_BYTES));
176178
ut_ad(ut_is_2pow(zip_size));
177179
ut_ad(comp || !zip_size);
178180

0 commit comments

Comments
 (0)