database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-13 23:48:21 +03:00
Code Activity

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

Browse Source
This commit is contained in:
marko@hundin.mysql.fi
2005-07-05 12:10:20 +03:00
parent 951eff4213
commit 3760b8acfe
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
innobase/btr/btr0cur.c
View File

@@ -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;
} }

8
innobase/page/page0cur.c
View File

@@ -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));
ut_ad((mode == PAGE_CUR_L) || (mode == PAGE_CUR_LE) #ifdef UNIV_DEBUG
# ifdef PAGE_CUR_DBG # ifdef PAGE_CUR_DBG
|| (mode == PAGE_CUR_DBG) if (mode != PAGE_CUR_DBG)
# endif /* PAGE_CUR_DBG */ # endif /* PAGE_CUR_DBG */
# ifdef PAGE_CUR_LE_OR_EXTENDS # ifdef PAGE_CUR_LE_OR_EXTENDS
|| (mode == PAGE_CUR_LE_OR_EXTENDS) if (mode != PAGE_CUR_LE_OR_EXTENDS)
# endif /* PAGE_CUR_LE_OR_EXTENDS */ # endif /* PAGE_CUR_LE_OR_EXTENDS */
ut_ad((mode == PAGE_CUR_L) || (mode == PAGE_CUR_LE)
|| (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);