diff options
| -rw-r--r-- | innobase/btr/btr0cur.c | 7 | ||||
| -rw-r--r-- | innobase/page/page0cur.c | 14 |
2 files changed, 12 insertions, 9 deletions
diff --git a/innobase/btr/btr0cur.c b/innobase/btr/btr0cur.c index d76b139c3c8..f81cce5b8e9 100644 --- a/innobase/btr/btr0cur.c +++ b/innobase/btr/btr0cur.c @@ -392,11 +392,12 @@ btr_cur_search_to_nth_level( page_mode = PAGE_CUR_LE; break; default: - ut_ad(mode == PAGE_CUR_L #ifdef PAGE_CUR_LE_OR_EXTENDS - || mode == PAGE_CUR_LE_OR_EXTENDS + ut_ad(mode == PAGE_CUR_L || mode == PAGE_CUR_LE + || mode == PAGE_CUR_LE_OR_EXTENDS); +#else /* PAGE_CUR_LE_OR_EXTENDS */ + ut_ad(mode == PAGE_CUR_L || mode == PAGE_CUR_LE); #endif /* PAGE_CUR_LE_OR_EXTENDS */ - || mode == PAGE_CUR_LE); page_mode = mode; break; } diff --git a/innobase/page/page0cur.c b/innobase/page/page0cur.c index 562ef545e41..d0b89e81787 100644 --- a/innobase/page/page0cur.c +++ b/innobase/page/page0cur.c @@ -238,14 +238,16 @@ page_cur_search_with_match( && ilow_matched_fields && ilow_matched_bytes && cursor); ut_ad(dtuple_validate(tuple)); ut_ad(dtuple_check_typed(tuple)); +#ifdef UNIV_DEBUG +# ifdef PAGE_CUR_DBG + if (mode != PAGE_CUR_DBG) +# endif /* PAGE_CUR_DBG */ +# ifdef PAGE_CUR_LE_OR_EXTENDS + if (mode != PAGE_CUR_LE_OR_EXTENDS) +# endif /* PAGE_CUR_LE_OR_EXTENDS */ ut_ad((mode == PAGE_CUR_L) || (mode == PAGE_CUR_LE) -#ifdef PAGE_CUR_DBG - || (mode == PAGE_CUR_DBG) -#endif /* PAGE_CUR_DBG */ -#ifdef PAGE_CUR_LE_OR_EXTENDS - || (mode == PAGE_CUR_LE_OR_EXTENDS) -#endif /* PAGE_CUR_LE_OR_EXTENDS */ || (mode == PAGE_CUR_G) || (mode == PAGE_CUR_GE)); +#endif /* UNIV_DEBUG */ page_check_dir(page); |