1 files changed, 12 insertions, 128 deletions

diff --git a/db2/log/log_auto.c b/db2/log/log_auto.c
index 61626b090e..2fe17834c3 100644
--- a/db2/log/log_auto.c
+++ b/db2/log/log_auto.c
@@ -20,16 +20,18 @@
 /*
  * PUBLIC: int __log_register_log
  * PUBLIC:     __P((DB_LOG *, DB_TXN *, DB_LSN *, u_int32_t,
- * PUBLIC:     DBT *, DBT *, u_int32_t, DBTYPE));
+ * PUBLIC:     u_int32_t, const DBT *, const DBT *, u_int32_t,
+ * PUBLIC:     DBTYPE));
  */
 int __log_register_log(logp, txnid, ret_lsnp, flags,
-	name, uid, id, ftype)
+	opcode, name, uid, id, ftype)
 	DB_LOG *logp;
 	DB_TXN *txnid;
 	DB_LSN *ret_lsnp;
 	u_int32_t flags;
-	DBT *name;
-	DBT *uid;
+	u_int32_t opcode;
+	const DBT *name;
+	const DBT *uid;
 	u_int32_t id;
 	DBTYPE ftype;
 {
@@ -49,6 +51,7 @@ int __log_register_log(logp, txnid, ret_lsnp, flags,
 	} else
 		lsnp = &txnid->last_lsn;
 	logrec.size = sizeof(rectype) + sizeof(txn_num) + sizeof(DB_LSN)
+	    + sizeof(opcode)
 	    + sizeof(u_int32_t) + (name == NULL ? 0 : name->size)
 	    + sizeof(u_int32_t) + (uid == NULL ? 0 : uid->size)
 	    + sizeof(id)
@@ -63,6 +66,8 @@ int __log_register_log(logp, txnid, ret_lsnp, flags,
 	bp += sizeof(txn_num);
 	memcpy(bp, lsnp, sizeof(DB_LSN));
 	bp += sizeof(DB_LSN);
+	memcpy(bp, &opcode, sizeof(opcode));
+	bp += sizeof(opcode);
 	if (name == NULL) {
 		zero = 0;
 		memcpy(bp, &zero, sizeof(u_int32_t));
@@ -129,6 +134,7 @@ __log_register_print(notused1, dbtp, lsnp, notused3, notused4)
 	    (u_long)argp->txnid->txnid,
 	    (u_long)argp->prev_lsn.file,
 	    (u_long)argp->prev_lsn.offset);
+	printf("\topcode: %lu\n", (u_long)argp->opcode);
 	printf("\tname: ");
 	for (i = 0; i < argp->name.size; i++) {
 		c = ((char *)argp->name.data)[i];
@@ -177,6 +183,8 @@ __log_register_read(recbuf, argpp)
 	bp += sizeof(argp->txnid->txnid);
 	memcpy(&argp->prev_lsn, bp, sizeof(DB_LSN));
 	bp += sizeof(DB_LSN);
+	memcpy(&argp->opcode, bp, sizeof(argp->opcode));
+	bp += sizeof(argp->opcode);
 	memcpy(&argp->name.size, bp, sizeof(u_int32_t));
 	bp += sizeof(u_int32_t);
 	argp->name.data = bp;
@@ -194,124 +202,6 @@ __log_register_read(recbuf, argpp)
 }
 
 /*
- * PUBLIC: int __log_unregister_log
- * PUBLIC:     __P((DB_LOG *, DB_TXN *, DB_LSN *, u_int32_t,
- * PUBLIC:     u_int32_t));
- */
-int __log_unregister_log(logp, txnid, ret_lsnp, flags,
-	id)
-	DB_LOG *logp;
-	DB_TXN *txnid;
-	DB_LSN *ret_lsnp;
-	u_int32_t flags;
-	u_int32_t id;
-{
-	DBT logrec;
-	DB_LSN *lsnp, null_lsn;
-	u_int32_t rectype, txn_num;
-	int ret;
-	u_int8_t *bp;
-
-	rectype = DB_log_unregister;
-	txn_num = txnid == NULL ? 0 : txnid->txnid;
-	if (txnid == NULL) {
-		null_lsn.file = 0;
-		null_lsn.offset = 0;
-		lsnp = &null_lsn;
-	} else
-		lsnp = &txnid->last_lsn;
-	logrec.size = sizeof(rectype) + sizeof(txn_num) + sizeof(DB_LSN)
-	    + sizeof(id);
-	if ((logrec.data = (void *)__db_malloc(logrec.size)) == NULL)
-		return (ENOMEM);
-
-	bp = logrec.data;
-	memcpy(bp, &rectype, sizeof(rectype));
-	bp += sizeof(rectype);
-	memcpy(bp, &txn_num, sizeof(txn_num));
-	bp += sizeof(txn_num);
-	memcpy(bp, lsnp, sizeof(DB_LSN));
-	bp += sizeof(DB_LSN);
-	memcpy(bp, &id, sizeof(id));
-	bp += sizeof(id);
-#ifdef DEBUG
-	if ((u_int32_t)(bp - (u_int8_t *)logrec.data) != logrec.size)
-		fprintf(stderr, "Error in log record length");
-#endif
-	ret = __log_put(logp, ret_lsnp, (DBT *)&logrec, flags);
-	if (txnid != NULL)
-		txnid->last_lsn = *ret_lsnp;
-	__db_free(logrec.data);
-	return (ret);
-}
-
-/*
- * PUBLIC: int __log_unregister_print
- * PUBLIC:    __P((DB_LOG *, DBT *, DB_LSN *, int, void *));
- */
-int
-__log_unregister_print(notused1, dbtp, lsnp, notused3, notused4)
-	DB_LOG *notused1;
-	DBT *dbtp;
-	DB_LSN *lsnp;
-	int notused3;
-	void *notused4;
-{
-	__log_unregister_args *argp;
-	u_int32_t i;
-	int c, ret;
-
-	i = 0;
-	c = 0;
-	notused1 = NULL;
-	notused3 = 0;
-	notused4 = NULL;
-
-	if ((ret = __log_unregister_read(dbtp->data, &argp)) != 0)
-		return (ret);
-	printf("[%lu][%lu]log_unregister: rec: %lu txnid %lx prevlsn [%lu][%lu]\n",
-	    (u_long)lsnp->file,
-	    (u_long)lsnp->offset,
-	    (u_long)argp->type,
-	    (u_long)argp->txnid->txnid,
-	    (u_long)argp->prev_lsn.file,
-	    (u_long)argp->prev_lsn.offset);
-	printf("\tid: %lu\n", (u_long)argp->id);
-	printf("\n");
-	__db_free(argp);
-	return (0);
-}
-
-/*
- * PUBLIC: int __log_unregister_read __P((void *, __log_unregister_args **));
- */
-int
-__log_unregister_read(recbuf, argpp)
-	void *recbuf;
-	__log_unregister_args **argpp;
-{
-	__log_unregister_args *argp;
-	u_int8_t *bp;
-
-	argp = (__log_unregister_args *)__db_malloc(sizeof(__log_unregister_args) +
-	    sizeof(DB_TXN));
-	if (argp == NULL)
-		return (ENOMEM);
-	argp->txnid = (DB_TXN *)&argp[1];
-	bp = recbuf;
-	memcpy(&argp->type, bp, sizeof(argp->type));
-	bp += sizeof(argp->type);
-	memcpy(&argp->txnid->txnid,  bp, sizeof(argp->txnid->txnid));
-	bp += sizeof(argp->txnid->txnid);
-	memcpy(&argp->prev_lsn, bp, sizeof(DB_LSN));
-	bp += sizeof(DB_LSN);
-	memcpy(&argp->id, bp, sizeof(argp->id));
-	bp += sizeof(argp->id);
-	*argpp = argp;
-	return (0);
-}
-
-/*
  * PUBLIC: int __log_init_print __P((DB_ENV *));
  */
 int
@@ -323,9 +213,6 @@ __log_init_print(dbenv)
 	if ((ret = __db_add_recovery(dbenv,
 	    __log_register_print, DB_log_register)) != 0)
 		return (ret);
-	if ((ret = __db_add_recovery(dbenv,
-	    __log_unregister_print, DB_log_unregister)) != 0)
-		return (ret);
 	return (0);
 }
 
@@ -341,9 +228,6 @@ __log_init_recover(dbenv)
 	if ((ret = __db_add_recovery(dbenv,
 	    __log_register_recover, DB_log_register)) != 0)
 		return (ret);
-	if ((ret = __db_add_recovery(dbenv,
-	    __log_unregister_recover, DB_log_unregister)) != 0)
-		return (ret);
 	return (0);
 }