List:Commits« Previous MessageNext Message »
From:Sunny Bains Date:May 3 2010 11:31pm
Subject:bzr commit into mysql-trunk-innodb branch (Sunny.Bains:3051)
View as plain text  
#At file:///Users/sunny/innodb/bzr/mysql-trunk-innodb/ based on revid:sunny.bains@stripped

 3051 Sunny Bains	2010-05-04
      We have no choice but to assert that the purge mutex should be held for these
      functions. Their callers already assert that.

    modified:
      storage/innobase/trx/trx0purge.c
=== modified file 'storage/innobase/trx/trx0purge.c'
--- a/storage/innobase/trx/trx0purge.c	revid:sunny.bains@stripped
+++ b/storage/innobase/trx/trx0purge.c	revid:sunny.bains@stripped
@@ -114,7 +114,7 @@ trx_purge_arr_set_info(
 	trx_undo_inf_t*	cell;
 	int		trx_cmp;
 
-	ut_ad(!purge_mutex_own());
+	ut_ad(purge_mutex_own());
 
 	cell = trx_undo_arr_get_nth_info(purge_sys->arr, index);
 
@@ -131,7 +131,7 @@ trx_purge_arr_set_info(
 		cell->undo_no = undo_no;
 	}
 
-	os_atomic_inc_ulint(&purge_sys->mutex, &purge_sys->arr->n_used, 1);
+	++purge_sys->arr->n_used;
 
 	return(cell);
 }
@@ -673,7 +673,7 @@ ibool
 trx_purge_truncate_if_arr_empty(void)
 /*=================================*/
 {
-	ut_ad(!purge_mutex_own());
+	ut_ad(purge_mutex_own());
 
 	if (purge_sys->arr->n_used == 0) {
 


Attachment: [text/bzr-bundle] bzr/sunny.bains@oracle.com-20100503233027-ja056uimwwbiqqf3.bundle
Thread
bzr commit into mysql-trunk-innodb branch (Sunny.Bains:3051) Sunny Bains4 May