diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-14 07:52:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-14 07:52:32 +0300 |
| commit | 88106ef3529ac908d9adf88242722752f11b59a2 (patch) | |
| tree | f6e43473cd72d794290217f1ec633f82f9eef929 /storage/innobase/include | |
| parent | f5a833c3e085524585d1ae5b8303c168f075dab3 (diff) | |
| download | mariadb-git-88106ef3529ac908d9adf88242722752f11b59a2.tar.gz | |
Fix a warning for a debug assertion
The type uint16_t is apparently promoted to int in a comparison,
causing a sign mismatch when comparing to ulint.
Convert both operands to uint16_t.
Diffstat (limited to 'storage/innobase/include')
| -rw-r--r-- | storage/innobase/include/page0page.ic | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/include/page0page.ic b/storage/innobase/include/page0page.ic index b464e497de1..db98f2e6558 100644 --- a/storage/innobase/include/page0page.ic +++ b/storage/innobase/include/page0page.ic @@ -731,7 +731,7 @@ page_dir_set_n_heap( ulint n_heap) /*!< in: number of records */ { ut_ad(n_heap < 0x8000); - ut_ad(!page_zip || n_heap + ut_ad(!page_zip || uint16_t(n_heap) == (page_header_get_field(page, PAGE_N_HEAP) & 0x7fff) + 1); page_header_set_field(page, page_zip, PAGE_N_HEAP, n_heap |