diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-25 17:18:15 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-25 17:18:15 +0200 |
| commit | 8b480df63ec76963fd96d2e00b911a801b912591 (patch) | |
| tree | 4bc43fd486fbbfef4e05977a2080c4e1dbb59da9 /storage/innobase/include/page0page.ic | |
| parent | c0ba036b774b8e35567dccce421890d2199f30ce (diff) | |
| parent | dbc0d576a3f402ae52423fe424ed0a68f49537ef (diff) | |
| download | mariadb-git-8b480df63ec76963fd96d2e00b911a801b912591.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/include/page0page.ic')
| -rw-r--r-- | storage/innobase/include/page0page.ic | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/storage/innobase/include/page0page.ic b/storage/innobase/include/page0page.ic index ad0ea913af9..641323e7d41 100644 --- a/storage/innobase/include/page0page.ic +++ b/storage/innobase/include/page0page.ic @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1994, 2015, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2016, 2018, MariaDB Corporation. +Copyright (c) 2016, 2019, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -83,7 +83,8 @@ UNIV_INLINE ib_uint64_t page_get_autoinc(const page_t* page) { - ut_ad(page_is_root(page)); + ut_ad(fil_page_index_page_check(page)); + ut_ad(!page_has_siblings(page)); return(mach_read_from_8(PAGE_HEADER + PAGE_ROOT_AUTO_INC + page)); } @@ -164,6 +165,7 @@ page_header_set_field( { ut_ad(page); ut_ad(field <= PAGE_N_RECS); + ut_ad(field != PAGE_N_RECS || val); ut_ad(field == PAGE_N_HEAP || val < srv_page_size); ut_ad(field != PAGE_N_HEAP || (val & 0x7fff) < srv_page_size); |