*** include/log.h.orig	Tue Nov 10 11:50:03 1998
--- include/log.h	Wed Aug 11 16:06:58 1999
***************
*** 51,56 ****
--- 51,57 ----
   */
  typedef	struct __db_entry {
  	DB	 *dbp;			/* Associated DB structure. */
+ 	char 	 *name;			/* File name. */
  	u_int32_t refcount;		/* Reference counted. */
  	int	  deleted;		/* File was not found during open. */
  } DB_ENTRY;
*** include/log_ext.h.orig	Wed Aug 11 16:06:27 1999
--- include/log_ext.h	Wed Aug 11 16:06:38 1999
***************
*** 19,25 ****
  int __log_name __P((DB_LOG *, u_int32_t, char **, int *, u_int32_t));
  int __log_register_recover
      __P((DB_LOG *, DBT *, DB_LSN *, int, void *));
! int __log_add_logid __P((DB_LOG *, DB *, u_int32_t));
  int __db_fileid_to_db __P((DB_LOG *, DB **, u_int32_t));
  void __log_close_files __P((DB_LOG *));
  void __log_rem_logid __P((DB_LOG *, u_int32_t));
--- 19,25 ----
  int __log_name __P((DB_LOG *, u_int32_t, char **, int *, u_int32_t));
  int __log_register_recover
      __P((DB_LOG *, DBT *, DB_LSN *, int, void *));
! int __log_add_logid __P((DB_LOG *, DB *, const char *, u_int32_t));
  int __db_fileid_to_db __P((DB_LOG *, DB **, u_int32_t));
  void __log_close_files __P((DB_LOG *));
  void __log_rem_logid __P((DB_LOG *, u_int32_t));
*** log/log.c.orig	Mon Apr 12 12:07:38 1999
--- log/log.c	Wed Aug 11 15:36:34 1999
***************
*** 432,437 ****
--- 432,438 ----
  log_close(dblp)
  	DB_LOG *dblp;
  {
+ 	u_int32_t i;
  	int ret, t_ret;
  
  	LOG_PANIC_CHECK(dblp);
***************
*** 457,465 ****
  	if (dblp->c_fd != -1 &&
  	    (t_ret = __os_close(dblp->c_fd)) != 0 && ret == 0)
  		ret = t_ret;
! 	if (dblp->dbentry != NULL)
  		__os_free(dblp->dbentry,
  		    (dblp->dbentry_cnt * sizeof(DB_ENTRY)));
  	if (dblp->dir != NULL)
  		__os_freestr(dblp->dir);
  
--- 458,471 ----
  	if (dblp->c_fd != -1 &&
  	    (t_ret = __os_close(dblp->c_fd)) != 0 && ret == 0)
  		ret = t_ret;
! 	if (dblp->dbentry != NULL) {
! 		for (i = 0; i < dblp->dbentry_cnt; i++)
! 			if (dblp->dbentry[i].name != NULL)
! 				__os_freestr(dblp->dbentry[i].name);
  		__os_free(dblp->dbentry,
  		    (dblp->dbentry_cnt * sizeof(DB_ENTRY)));
+ 	}
+ 
  	if (dblp->dir != NULL)
  		__os_freestr(dblp->dir);
  
*** log/log_rec.c.orig	Mon Apr 12 12:07:38 1999
--- log/log_rec.c	Fri Aug 13 16:30:27 1999
***************
*** 73,78 ****
--- 73,79 ----
  	int redo;
  	void *info;
  {
+ 	DB_ENTRY *dbe;
  	__log_register_args *argp;
  	int ret;
  
***************
*** 104,113 ****
  				    argp->name.data, strerror(ENOENT));
  			ret = 0;
  		}
! 	} else if (argp->opcode != LOG_CHECKPOINT) {
  		/*
! 		 * If we are redoing a close or undoing an open, then we need
! 		 * to close the file.
  		 *
    		 * If the file is deleted, then we can just ignore this close.
   		 * Otherwise, we should usually have a valid dbp we should
--- 105,120 ----
  				    argp->name.data, strerror(ENOENT));
  			ret = 0;
  		}
! 	} else if (argp->opcode != LOG_CHECKPOINT &&
! 	    argp->opcode != LOG_CLOSE) {
  		/*
! 		 * If we are undoing an open, then we need to close the file.
! 		 * Note that we do *not* close the file if we are redoing a
! 		 * close, because we do not log the reference counts on log
! 		 * files and we may have had the file open multiple times,
! 		 * and therefore, this close should just dec a reference
! 		 * count.  However, since we only do one open during a
! 		 * checkpoint, this will inadvertently close the file.
  		 *
    		 * If the file is deleted, then we can just ignore this close.
   		 * Otherwise, we should usually have a valid dbp we should
***************
*** 116,129 ****
  		 * may, in fact, not have the file open, and that's OK.
  		 */
  		LOCK_LOGTHREAD(logp);
! 		if (logp->dbentry[argp->id].dbp != NULL &&
! 		    --logp->dbentry[argp->id].refcount == 0) {
! 			ret = logp->dbentry[argp->id].dbp->close(
! 			    logp->dbentry[argp->id].dbp, 0);
! 			logp->dbentry[argp->id].dbp = NULL;
  		}
  		UNLOCK_LOGTHREAD(logp);
!  	} else if (redo == TXN_UNDO &&
   	    (argp->id >= logp->dbentry_cnt ||
   	    (!logp->dbentry[argp->id].deleted &&
   	    logp->dbentry[argp->id].dbp == NULL))) {
--- 123,141 ----
  		 * may, in fact, not have the file open, and that's OK.
  		 */
  		LOCK_LOGTHREAD(logp);
! 		if (argp->id < logp->dbentry_cnt) {
! 			dbe = &logp->dbentry[argp->id];
! 			if (dbe->dbp != NULL && --dbe->refcount == 0) {
! 				ret = dbe->dbp->close(dbe->dbp, 0);
! 				if (dbe->name != NULL) {
! 					__os_freestr(dbe->name);
! 					dbe->name = NULL;
! 				}
! 				(void)__log_rem_logid(logp, argp->id);
! 			}
  		}
  		UNLOCK_LOGTHREAD(logp);
!  	} else if (argp->opcode == LOG_CHECKPOINT && redo == TXN_UNDO &&
   	    (argp->id >= logp->dbentry_cnt ||
   	    (!logp->dbentry[argp->id].deleted &&
   	    logp->dbentry[argp->id].dbp == NULL))) {
***************
*** 160,176 ****
  	DB_LOG *lp;
  	__log_register_args *argp;
  {
  	LOCK_LOGTHREAD(lp);
! 	if (argp->id < lp->dbentry_cnt &&
! 	    (lp->dbentry[argp->id].deleted == 1 ||
! 	    lp->dbentry[argp->id].dbp != NULL)) {
! 		if (argp->opcode != LOG_CHECKPOINT)
! 			lp->dbentry[argp->id].refcount++;
  
  		UNLOCK_LOGTHREAD(lp);
  		return (0);
  	}
! 	UNLOCK_LOGTHREAD(lp);
  	return (__log_do_open(lp,
  	    argp->uid.data, argp->name.data, argp->ftype, argp->id));
  }
--- 172,213 ----
  	DB_LOG *lp;
  	__log_register_args *argp;
  {
+ 	DB_ENTRY *dbe;
+   
+ 	if (argp->name.size == 0)
+ 		return(0);
+   
+ 	/*
+ 	 * Because of reference counting, we cannot automatically close files
+ 	 * during recovery, so when we're opening, we have to check that the
+ 	 * name we are opening is what we expect.  If it's not, then we close
+ 	 * the old file and open the new one.
+ 	 */
  	LOCK_LOGTHREAD(lp);
! 	if (argp->id < lp->dbentry_cnt)
! 		dbe = &lp->dbentry[argp->id];
! 	else
! 		dbe = NULL;
! 
! 	if (dbe != NULL && (dbe->deleted == 1 || dbe->dbp != NULL) &&
! 	    dbe->name != NULL && argp->name.data != NULL &&
! 	    strncmp(argp->name.data, dbe->name, argp->name.size) == 0) {
  
+ 		dbe->refcount++;
  		UNLOCK_LOGTHREAD(lp);
  		return (0);
  	}
!   	UNLOCK_LOGTHREAD(lp);
! 
! 	if (dbe != NULL && dbe->dbp != NULL) {
!                 (void)dbe->dbp->close(dbe->dbp, 0);
! 		if (dbe->name != NULL)
! 			__os_freestr(dbe->name);
!                 dbe->name = NULL;
! 		(void)__log_rem_logid(lp, argp->id);
!         }
! 
! 
  	return (__log_do_open(lp,
  	    argp->uid.data, argp->name.data, argp->ftype, argp->id));
  }
***************
*** 206,212 ****
  	}
  
  	if (ret == 0 || ret == ENOENT)
! 		(void)__log_add_logid(lp, dbp, ndx);
  
  	return (ret);
  }
--- 243,249 ----
  	}
  
  	if (ret == 0 || ret == ENOENT)
! 		(void)__log_add_logid(lp, dbp, name, ndx);
  
  	return (ret);
  }
***************
*** 215,226 ****
   * __log_add_logid --
   *	Adds a DB entry to the log's DB entry table.
   *
!  * PUBLIC: int __log_add_logid __P((DB_LOG *, DB *, u_int32_t));
   */
  int
! __log_add_logid(logp, dbp, ndx)
  	DB_LOG *logp;
  	DB *dbp;
  	u_int32_t ndx;
  {
  	u_int32_t i;
--- 252,264 ----
   * __log_add_logid --
   *	Adds a DB entry to the log's DB entry table.
   *
!  * PUBLIC: int __log_add_logid __P((DB_LOG *, DB *, const char *, u_int32_t));
   */
  int
! __log_add_logid(logp, dbp, name, ndx)
  	DB_LOG *logp;
  	DB *dbp;
+ 	const char *name;
  	u_int32_t ndx;
  {
  	u_int32_t i;
***************
*** 244,260 ****
--- 282,308 ----
  		for (i = logp->dbentry_cnt; i < ndx + DB_GROW_SIZE; i++) {
  			logp->dbentry[i].dbp = NULL;
  			logp->dbentry[i].deleted = 0;
+ 			logp->dbentry[i].name = NULL;
  		}
  
  		logp->dbentry_cnt = i;
  	}
  
+ 	/* Make space for the name and copy it in. */
+ 	if (name != NULL) {
+ 		if ((ret = __os_malloc(strlen(name) + 1, 
+ 		    NULL, &logp->dbentry[ndx].name)) != 0)
+ 			goto err;
+ 		strcpy(logp->dbentry[ndx].name, name);
+ 	}
+ 
  	if (logp->dbentry[ndx].deleted == 0 && logp->dbentry[ndx].dbp == NULL) {
  		logp->dbentry[ndx].dbp = dbp;
  		logp->dbentry[ndx].refcount = 1;
  		logp->dbentry[ndx].deleted = dbp == NULL;
  	} else
  		logp->dbentry[ndx].refcount++;
+ 
  
  err:	UNLOCK_LOGTHREAD(logp);
  	return (ret);
*** log/log_register.c.orig	Mon Apr 12 12:07:24 1999
--- log/log_register.c	Wed Aug 11 15:48:14 1999
***************
*** 117,123 ****
  		if ((ret = __log_register_log(dblp, NULL, &r_unused,
  		    0, LOG_OPEN, &r_name, &fid_dbt, fnp->id, type)) != 0)
  			goto err;
! 		if ((ret = __log_add_logid(dblp, dbp, fnp->id)) != 0)
  			goto err;
  	}
  
--- 117,123 ----
  		if ((ret = __log_register_log(dblp, NULL, &r_unused,
  		    0, LOG_OPEN, &r_name, &fid_dbt, fnp->id, type)) != 0)
  			goto err;
! 		if ((ret = __log_add_logid(dblp, dbp, name, fnp->id)) != 0)
  			goto err;
  	}