bk commit into 5.0 tree (aivanov:1.2208)

[Alex Ivanov Notebook]

Below is the list of changes that have just been committed into a local
5.0 repository of alexi. When alexi 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.2208 06/07/26 08:26:07 aivanov@stripped +3 -0
  Applied innodb-5.0-ss660 snapshot.

  innobase/include/sync0rw.ic
    1.11 06/07/26 08:25:57 aivanov@stripped +1 -1
    Applied innodb-5.0-ss660 snapshot.
     rw_lock_s_unlock_func(): Change a debug assertion to a
     production assertion in order to track down Bug#19081.

  innobase/ibuf/ibuf0ibuf.c
    1.43 06/07/26 08:25:57 aivanov@stripped +6 -9
    Applied innodb-5.0-ss660 snapshot.
     ibuf_fixed_addr_page(): Add parameter space. As the insert buffer
     B-tree is only located in the system tablespace (space 0),
     IBUF_TREE_ROOT_PAGE_NO is only special in space 0.

  innobase/btr/btr0cur.c
    1.56 06/07/26 08:25:57 aivanov@stripped +2 -1
    Applied innodb-5.0-ss660 snapshot.
     btr_cur_search_to_nth_level(): Reacquire btr_search_latch after
     inserting to the insert buffer. This was noticed while analyzing
     Bug#19081 but this shold not fix this bug since according to
     Heikki, btr_search_latch is not reserved during an insert.

# 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:	aivanov
# Host:	mysqld.localdomain
# Root:	/home/alexi/innodb/mysql-5.0-work

--- 1.55/innobase/btr/btr0cur.c	2006-03-29 23:04:26 +04:00
+++ 1.56/innobase/btr/btr0cur.c	2006-07-26 08:25:57 +04:00
@@ -439,7 +439,7 @@
 				if (UNIV_LIKELY_NULL(heap)) {
 					mem_heap_free(heap);
 				}
-				return;
+				goto func_exit;
 			}
 
 			/* Insert to the insert buffer did not succeed:
@@ -555,6 +555,7 @@
 						|| mode != PAGE_CUR_LE);
 	}
 
+func_exit:
 	if (has_search_latch) {
 		
 		rw_lock_s_lock(&btr_search_latch);

--- 1.42/innobase/ibuf/ibuf0ibuf.c	2006-07-26 07:54:21 +04:00
+++ 1.43/innobase/ibuf/ibuf0ibuf.c	2006-07-26 08:25:57 +04:00
@@ -950,14 +950,11 @@
 ibuf_fixed_addr_page(
 /*=================*/
 			/* out: TRUE if a fixed address ibuf i/o page */
+	ulint	space,	/* in: space id */
 	ulint	page_no)/* in: page number */
 {
-	if ((ibuf_bitmap_page(page_no))
-				|| (page_no == IBUF_TREE_ROOT_PAGE_NO)) {
-		return(TRUE);
-	}
-
-	return(FALSE);
+	return((space == 0 && page_no == IBUF_TREE_ROOT_PAGE_NO)
+			|| ibuf_bitmap_page(page_no));
 }
 
 /***************************************************************************
@@ -981,7 +978,7 @@
 		return(FALSE);
 	}
 
-	if (ibuf_fixed_addr_page(page_no)) {
+	if (ibuf_fixed_addr_page(space, page_no)) {
 
 		return(TRUE);
 	}
@@ -1029,7 +1026,7 @@
 		return(FALSE);
 	}
 #endif	
-	if (ibuf_fixed_addr_page(page_no)) {
+	if (ibuf_fixed_addr_page(space, page_no)) {
 
 		return(TRUE);
 	}
@@ -3052,7 +3049,7 @@
 		return;
 	}
 #endif	
-	if (ibuf_fixed_addr_page(page_no) || fsp_descr_page(page_no)
+	if (ibuf_fixed_addr_page(space, page_no) || fsp_descr_page(page_no)
 					|| trx_sys_hdr_page(space, page_no)) {
 		return;
 	}

--- 1.10/innobase/include/sync0rw.ic	2005-04-22 14:58:43 +04:00
+++ 1.11/innobase/include/sync0rw.ic	2006-07-26 08:25:57 +04:00
@@ -362,7 +362,7 @@
 
 	/* Reset the shared lock by decrementing the reader count */
 
-	ut_ad(lock->reader_count > 0);
+	ut_a(lock->reader_count > 0);
 	lock->reader_count--;
 
 #ifdef UNIV_SYNC_DEBUG