Commit 48db5c8f authored by unknown's avatar unknown

InnoDB: Fix compile-pentium-debug-max compilation problem.


innobase/btr/btr0cur.c:
  Move #ifdef outside ut_ad() argument.
innobase/page/page0cur.c:
  Move #ifdef outside ut_ad() argument.
parent 8226e5fc
...@@ -392,11 +392,12 @@ btr_cur_search_to_nth_level( ...@@ -392,11 +392,12 @@ btr_cur_search_to_nth_level(
page_mode = PAGE_CUR_LE; page_mode = PAGE_CUR_LE;
break; break;
default: default:
ut_ad(mode == PAGE_CUR_L
#ifdef PAGE_CUR_LE_OR_EXTENDS #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 */ #endif /* PAGE_CUR_LE_OR_EXTENDS */
|| mode == PAGE_CUR_LE);
page_mode = mode; page_mode = mode;
break; break;
} }
......
...@@ -238,14 +238,16 @@ page_cur_search_with_match( ...@@ -238,14 +238,16 @@ page_cur_search_with_match(
&& ilow_matched_fields && ilow_matched_bytes && cursor); && ilow_matched_fields && ilow_matched_bytes && cursor);
ut_ad(dtuple_validate(tuple)); ut_ad(dtuple_validate(tuple));
ut_ad(dtuple_check_typed(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) 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)); || (mode == PAGE_CUR_G) || (mode == PAGE_CUR_GE));
#endif /* UNIV_DEBUG */
page_check_dir(page); page_check_dir(page);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment