bk commit into 5.0 tree (marko:1.1884)

[Marko Mäkelä]

Below is the list of changes that have just been committed into a local
5.0 repository of marko. When marko does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1884 05/07/05 12:10:20 marko@stripped +2 -0
  InnoDB: Fix compile-pentium-debug-max compilation problem.

  innobase/page/page0cur.c
    1.27 05/07/05 12:10:10 marko@stripped +8 -6
    Move #ifdef outside ut_ad() argument.

  innobase/btr/btr0cur.c
    1.54 05/07/05 12:10:10 marko@stripped +4 -3
    Move #ifdef outside ut_ad() argument.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	marko
# Host:	hundin.mysql.fi
# Root:	/home/marko/mysql-5.0-current

--- 1.53/innobase/btr/btr0cur.c	Thu Jun 30 11:14:57 2005
+++ 1.54/innobase/btr/btr0cur.c	Tue Jul  5 12:10:10 2005
@@ -392,11 +392,12 @@
 		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;
 	}

--- 1.26/innobase/page/page0cur.c	Thu Jun 30 11:14:57 2005
+++ 1.27/innobase/page/page0cur.c	Tue Jul  5 12:10:10 2005
@@ -238,14 +238,16 @@
 	      && 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);