diff options
Diffstat (limited to 'bdb/txn/txn.src')
| -rw-r--r-- | bdb/txn/txn.src | 69 |
1 files changed, 24 insertions, 45 deletions
diff --git a/bdb/txn/txn.src b/bdb/txn/txn.src index b1e131c2bd7..3f69b29e3ff 100644 --- a/bdb/txn/txn.src +++ b/bdb/txn/txn.src @@ -1,13 +1,14 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1996, 1997, 1998, 1999, 2000 + * Copyright (c) 1996-2002 * Sleepycat Software. All rights reserved. * - * $Id: txn.src,v 11.10 2001/01/02 00:58:33 margo Exp $ + * $Id: txn.src,v 11.19 2002/03/27 04:33:15 bostic Exp $ */ -PREFIX txn +PREFIX __txn +DBPRIVATE INCLUDE #include "db_config.h" INCLUDE @@ -15,25 +16,20 @@ INCLUDE #ifndef NO_SYSTEM_INCLUDES INCLUDE #include <sys/types.h> INCLUDE INCLUDE #include <ctype.h> -INCLUDE #include <errno.h> INCLUDE #include <string.h> INCLUDE #endif INCLUDE INCLUDE #include "db_int.h" -INCLUDE #include "db_page.h" -INCLUDE #include "db_dispatch.h" -INCLUDE #include "db_am.h" -INCLUDE #include "txn.h" +INCLUDE #include "dbinc/crypto.h" +INCLUDE #include "dbinc/db_page.h" +INCLUDE #include "dbinc/db_dispatch.h" +INCLUDE #include "dbinc/db_am.h" +INCLUDE #include "dbinc/log.h" +INCLUDE #include "dbinc/rep.h" +INCLUDE #include "dbinc/txn.h" INCLUDE /* - * DEPRECATED in 3.1 to add timestamps. - */ -DEPRECATED old_regop 6 -ARG opcode u_int32_t lu -END - -/* * This is the standard log operation for commit. * Note that we are using an int32_t for the timestamp. This means that * in 2039 we will need to deprecate this log record and create one that @@ -44,11 +40,6 @@ ARG opcode u_int32_t lu ARG timestamp int32_t ld END -DEPRECATED old_ckp 7 -POINTER ckp_lsn DB_LSN * lu -POINTER last_ckp DB_LSN * lu -END - /* * This is the checkpoint record. It contains the lsn that the checkpoint * guarantees and a pointer to the last checkpoint so we can walk backwards @@ -70,20 +61,19 @@ ARG timestamp int32_t ld END /* - * This is the standard log operation for prepare (since right now - * we only use prepare in an XA environment). + * This is the (new) log operation for a child commit. It is + * logged as a record in the PARENT. The child field contains + * the transaction ID of the child committing and the c_lsn is + * the last LSN of the child's log trail. */ -DEPRECATED xa_regop_old 8 -ARG opcode u_int32_t lu -DBT xid DBT s -ARG formatID int32_t ld -ARG gtrid u_int32_t u -ARG bqual u_int32_t u +BEGIN child 12 +ARG child u_int32_t lx +POINTER c_lsn DB_LSN * lu END + /* - * This is the standard log operation for prepare (since right now - * we only use prepare in an XA environment). + * This is the standard log operation for prepare. */ BEGIN xa_regop 13 ARG opcode u_int32_t lu @@ -95,20 +85,9 @@ POINTER begin_lsn DB_LSN * lu END /* - * This is the log operation for a child commit. - */ -DEPRECATED child_old 9 -ARG opcode u_int32_t lu -ARG parent u_int32_t lx -END - -/* - * This is the (new) log operation for a child commit. It is - * logged as a record in the PARENT. The child field contains - * the transaction ID of the child committing and the c_lsn is - * the last LSN of the child's log trail. + * Log the fact that we are recycling txnids. */ -BEGIN child 12 -ARG child u_int32_t lx -POINTER c_lsn DB_LSN * lu +BEGIN recycle 14 +ARG min u_int32_t u +ARG max u_int32_t u END |