bk commit into 5.0 tree (marko:1.1945)

[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.1945 05/09/13 12:20:42 marko@stripped +2 -0
  Remove unused function btr_check_node_ptr() from non-debug builds.

  innobase/include/btr0btr.h
    1.16 05/09/13 12:20:31 marko@stripped +2 -0
    Exclude btr_check_node_ptr() from non-debug builds.

  innobase/btr/btr0btr.c
    1.45 05/09/13 12:20:31 marko@stripped +2 -0
    Exclude btr_check_node_ptr() from non-debug builds.

# 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

--- 1.44/innobase/btr/btr0btr.c	2005-06-27 18:57:25 +03:00
+++ 1.45/innobase/btr/btr0btr.c	2005-09-13 12:20:31 +03:00
@@ -2413,6 +2413,7 @@
 }
 #endif /* UNIV_BTR_PRINT */
 
+#ifdef UNIV_DEBUG
 /****************************************************************
 Checks that the node pointer to a page is appropriate. */
 
@@ -2458,6 +2459,7 @@
 
 	return(TRUE);
 }
+#endif /* UNIV_DEBUG */
 
 /****************************************************************
 Display identification information for a record. */

--- 1.15/innobase/include/btr0btr.h	2005-04-25 10:14:25 +03:00
+++ 1.16/innobase/include/btr0btr.h	2005-09-13 12:20:31 +03:00
@@ -287,6 +287,7 @@
 	dict_tree_t*	tree,	/* in: index tree */
 	page_t*		page,	/* in: page whose node pointer is deleted */
 	mtr_t*		mtr);	/* in: mtr */
+#ifdef UNIV_DEBUG
 /****************************************************************
 Checks that the node pointer to a page is appropriate. */
 
@@ -297,6 +298,7 @@
 	dict_tree_t*	tree,	/* in: index tree */
 	page_t*		page,	/* in: index page */
 	mtr_t*		mtr);	/* in: mtr */
+#endif /* UNIV_DEBUG */
 /*****************************************************************
 Tries to merge the page first to the left immediate brother if such a
 brother exists, and the node pointers to the current page and to the