Commit 0eb52d65 authored by unknown's avatar unknown
Browse files

Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 

into hundin.mysql.fi:/home/marko/mysql-5.0-current
parents ee734b44 48db5c8f

innobase/btr/btr0cur.c

+4 −3
Original line number Diff line number Diff line
@@ -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;

	}

innobase/page/page0cur.c

+8 −6
Original line number Diff line number Diff line
@@ -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));

	ut_ad((mode == PAGE_CUR_L) || (mode == PAGE_CUR_LE)

#ifdef UNIV_DEBUG

# ifdef PAGE_CUR_DBG

	      || (mode == PAGE_CUR_DBG)

	if (mode != PAGE_CUR_DBG)

# endif /* PAGE_CUR_DBG */

# 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 */

	ut_ad((mode == PAGE_CUR_L) || (mode == PAGE_CUR_LE)

	      || (mode == PAGE_CUR_G) || (mode == PAGE_CUR_GE));

#endif /* UNIV_DEBUG */



	page_check_dir(page);