summaryrefslogtreecommitdiff
path: root/innobase/page
diff options
context:
space:
mode:
authorunknown <marko@hundin.mysql.fi>2005-07-05 12:10:20 +0300
committerunknown <marko@hundin.mysql.fi>2005-07-05 12:10:20 +0300
commit48db5c8ffc5db5fe7da0e56ec04618229ba5a38e (patch)
treef9b9332f6f728a035173f47a0eb7e86e8474a4a5 /innobase/page
parent8226e5fcbd97e101b1ff464bc207df7d2abecf4d (diff)
downloadmariadb-git-48db5c8ffc5db5fe7da0e56ec04618229ba5a38e.tar.gz
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.
Diffstat (limited to 'innobase/page')
-rw-r--r--innobase/page/page0cur.c14
1 files changed, 8 insertions, 6 deletions
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);