[packages/db4.4.git] / patch.4.4.20.2

*** txn/txn.c.orig	Tue Nov  1 06:50:03 2005
--- txn/txn.c	Tue Jan 31 15:05:13 2006
***************
*** 1049,1060 ****
--- 1049,1062 ----
  		return (ret);
  	memcpy(txn->name, name, len);
  
+ 	TXN_SYSTEM_LOCK(dbenv);
  	if (td->name != INVALID_ROFF) {
  		__db_shalloc_free(
  		    &mgr->reginfo, R_ADDR(&mgr->reginfo, td->name));
  		td->name = INVALID_ROFF;
  	}
  	if ((ret = __db_shalloc(&mgr->reginfo, len, 0, &p)) != 0) {
+ 		TXN_SYSTEM_UNLOCK(dbenv);
  		__db_err(dbenv,
  		    "Unable to allocate memory for transaction name");
  
***************
*** 1063,1068 ****
--- 1065,1071 ----
  
  		return (ret);
  	}
+ 	TXN_SYSTEM_UNLOCK(dbenv);
  	td->name = R_OFFSET(&mgr->reginfo, p);
  	memcpy(p, name, len);
Commit	Line	Data
e9a6cd08 JB	1	*** txn/txn.c.orig Tue Nov 1 06:50:03 2005
	2	--- txn/txn.c Tue Jan 31 15:05:13 2006
	3	***************
	4	* 1049,1060 **
	5	--- 1049,1062 ----
	6	return (ret);
	7	memcpy(txn->name, name, len);
	8
	9	+ TXN_SYSTEM_LOCK(dbenv);
	10	if (td->name != INVALID_ROFF) {
	11	__db_shalloc_free(
	12	&mgr->reginfo, R_ADDR(&mgr->reginfo, td->name));
	13	td->name = INVALID_ROFF;
	14	}
	15	if ((ret = __db_shalloc(&mgr->reginfo, len, 0, &p)) != 0) {
	16	+ TXN_SYSTEM_UNLOCK(dbenv);
	17	__db_err(dbenv,
	18	"Unable to allocate memory for transaction name");
	19
	20	***************
	21	* 1063,1068 **
	22	--- 1065,1071 ----
	23
	24	return (ret);
	25	}
	26	+ TXN_SYSTEM_UNLOCK(dbenv);
	27	td->name = R_OFFSET(&mgr->reginfo, p);
	28	memcpy(p, name, len);
	29