aboutsummaryrefslogtreecommitdiff
path: root/db2/include
diff options
context:
space:
mode:
Diffstat (limited to 'db2/include')
-rw-r--r--db2/include/btree_auto.h19
-rw-r--r--db2/include/btree_ext.h17
-rw-r--r--db2/include/clib_ext.h2
-rw-r--r--db2/include/common_ext.h3
-rw-r--r--db2/include/db.h.src135
-rw-r--r--db2/include/db_am.h6
-rw-r--r--db2/include/db_auto.h1
-rw-r--r--db2/include/db_cxx.h19
-rw-r--r--db2/include/db_ext.h6
-rw-r--r--db2/include/db_int.h.src28
-rw-r--r--db2/include/hash.h6
-rw-r--r--db2/include/hash_auto.h18
-rw-r--r--db2/include/hash_ext.h15
-rw-r--r--db2/include/lock.h5
-rw-r--r--db2/include/lock_ext.h2
-rw-r--r--db2/include/log.h19
-rw-r--r--db2/include/log_ext.h2
-rw-r--r--db2/include/mp.h41
-rw-r--r--db2/include/mp_ext.h2
-rw-r--r--db2/include/mutex_ext.h4
-rw-r--r--db2/include/os_ext.h24
-rw-r--r--db2/include/os_func.h76
-rw-r--r--db2/include/txn.h8
-rw-r--r--db2/include/txn_ext.h2
24 files changed, 326 insertions, 134 deletions
diff --git a/db2/include/btree_auto.h b/db2/include/btree_auto.h
index b422e1db1b..041b80f196 100644
--- a/db2/include/btree_auto.h
+++ b/db2/include/btree_auto.h
@@ -58,6 +58,7 @@ typedef struct _bam_rsplit_args {
u_int32_t fileid;
db_pgno_t pgno;
DBT pgdbt;
+ db_pgno_t nrec;
DBT rootent;
DB_LSN rootlsn;
} __bam_rsplit_args;
@@ -105,4 +106,22 @@ typedef struct _bam_cdel_args {
u_int32_t indx;
} __bam_cdel_args;
+
+#define DB_bam_repl (DB_bam_BEGIN + 8)
+
+typedef struct _bam_repl_args {
+ u_int32_t type;
+ DB_TXN *txnid;
+ DB_LSN prev_lsn;
+ u_int32_t fileid;
+ db_pgno_t pgno;
+ DB_LSN lsn;
+ u_int32_t indx;
+ u_int32_t isdeleted;
+ DBT orig;
+ DBT repl;
+ u_int32_t prefix;
+ u_int32_t suffix;
+} __bam_repl_args;
+
#endif
diff --git a/db2/include/btree_ext.h b/db2/include/btree_ext.h
index 9133c58c6b..bbe0d971b2 100644
--- a/db2/include/btree_ext.h
+++ b/db2/include/btree_ext.h
@@ -1,4 +1,4 @@
-/* Do not edit: automatically built by dist/distrib. */
+/* DO NOT EDIT: automatically built by dist/distrib. */
int __bam_close __P((DB *));
int __bam_sync __P((DB *, int));
int __bam_cmp __P((DB *, const DBT *, EPG *));
@@ -35,6 +35,7 @@ int __bam_pget __P((DB *, PAGE **, db_pgno_t *, int));
int __bam_put __P((DB *, DB_TXN *, DBT *, DBT *, int));
int __bam_iitem __P((DB *,
PAGE **, db_indx_t *, DBT *, DBT *, int, int));
+int __bam_ritem __P((DB *, PAGE *, u_int32_t, DBT *));
int __bam_pg_alloc_recover
__P((DB_LOG *, DBT *, DB_LSN *, int, void *));
int __bam_pg_free_recover
@@ -49,6 +50,8 @@ int __bam_cadjust_recover
__P((DB_LOG *, DBT *, DB_LSN *, int, void *));
int __bam_cdel_recover
__P((DB_LOG *, DBT *, DB_LSN *, int, void *));
+int __bam_repl_recover
+ __P((DB_LOG *, DBT *, DB_LSN *, int, void *));
int __ram_open __P((DB *, DBTYPE, DB_INFO *));
int __ram_cursor __P((DB *, DB_TXN *, DBC **));
int __ram_close __P((DB *));
@@ -94,8 +97,8 @@ int __bam_split_print
int __bam_split_read __P((void *, __bam_split_args **));
int __bam_rsplit_log
__P((DB_LOG *, DB_TXN *, DB_LSN *, u_int32_t,
- u_int32_t, db_pgno_t, DBT *, DBT *,
- DB_LSN *));
+ u_int32_t, db_pgno_t, DBT *, db_pgno_t,
+ DBT *, DB_LSN *));
int __bam_rsplit_print
__P((DB_LOG *, DBT *, DB_LSN *, int, void *));
int __bam_rsplit_read __P((void *, __bam_rsplit_args **));
@@ -119,5 +122,13 @@ int __bam_cdel_log
int __bam_cdel_print
__P((DB_LOG *, DBT *, DB_LSN *, int, void *));
int __bam_cdel_read __P((void *, __bam_cdel_args **));
+int __bam_repl_log
+ __P((DB_LOG *, DB_TXN *, DB_LSN *, u_int32_t,
+ u_int32_t, db_pgno_t, DB_LSN *, u_int32_t,
+ u_int32_t, DBT *, DBT *, u_int32_t,
+ u_int32_t));
+int __bam_repl_print
+ __P((DB_LOG *, DBT *, DB_LSN *, int, void *));
+int __bam_repl_read __P((void *, __bam_repl_args **));
int __bam_init_print __P((DB_ENV *));
int __bam_init_recover __P((DB_ENV *));
diff --git a/db2/include/clib_ext.h b/db2/include/clib_ext.h
index 8ccd2b559f..91e4a13fa5 100644
--- a/db2/include/clib_ext.h
+++ b/db2/include/clib_ext.h
@@ -1,4 +1,4 @@
-/* Do not edit: automatically built by dist/distrib. */
+/* DO NOT EDIT: automatically built by dist/distrib. */
#ifdef __STDC__
void err __P((int eval, const char *, ...));
#else
diff --git a/db2/include/common_ext.h b/db2/include/common_ext.h
index 9840162a12..b814582abd 100644
--- a/db2/include/common_ext.h
+++ b/db2/include/common_ext.h
@@ -1,4 +1,4 @@
-/* Do not edit: automatically built by dist/distrib. */
+/* DO NOT EDIT: automatically built by dist/distrib. */
int __db_appname __P((DB_ENV *,
APPNAME, const char *, const char *, int *, char **));
int __db_apprec __P((DB_ENV *, int));
@@ -24,6 +24,7 @@ int __db_ferr __P((const DB_ENV *, const char *, int));
u_int32_t __db_log2 __P((u_int32_t));
int __db_rcreate __P((DB_ENV *, APPNAME,
const char *, const char *, int, size_t, int *, void *));
+int __db_rinit __P((DB_ENV *, RLAYOUT *, int, size_t, int));
int __db_ropen __P((DB_ENV *,
APPNAME, const char *, const char *, int, int *, void *));
int __db_rclose __P((DB_ENV *, int, void *));
diff --git a/db2/include/db.h.src b/db2/include/db.h.src
index 63d9603dba..3cc2bfd4fc 100644
--- a/db2/include/db.h.src
+++ b/db2/include/db.h.src
@@ -4,7 +4,7 @@
* Copyright (c) 1996, 1997
* Sleepycat Software. All rights reserved.
*
- * @(#)db.h.src 10.77 (Sleepycat) 9/24/97
+ * @(#)db.h.src 10.91 (Sleepycat) 11/3/97
*/
#ifndef _DB_H_
@@ -28,9 +28,15 @@
* XXX
* Handle function prototypes and the keyword "const". This steps on name
* space that DB doesn't control, but all of the other solutions are worse.
+ *
+ * XXX
+ * While Microsoft's compiler is ANSI C compliant, it doesn't have _STDC_
+ * defined by default, you specify a command line flag or #pragma to turn
+ * it on. Don't do that, however, because some of Microsoft's own header
+ * files won't compile.
*/
#undef __P
-#if defined(__STDC__) || defined(__cplusplus)
+#if defined(__STDC__) || defined(__cplusplus) || defined(_MSC_VER)
#define __P(protos) protos /* ANSI C prototypes */
#else
#define const
@@ -67,8 +73,8 @@
#define DB_VERSION_MAJOR 2
#define DB_VERSION_MINOR 3
-#define DB_VERSION_PATCH 10
-#define DB_VERSION_STRING "Sleepycat Software: DB 2.3.10: (9/24/97)"
+#define DB_VERSION_PATCH 12
+#define DB_VERSION_STRING "Sleepycat Software: DB 2.3.12: (11/3/97)"
typedef u_int32_t db_pgno_t; /* Page number type. */
typedef u_int16_t db_indx_t; /* Page offset type. */
@@ -93,6 +99,7 @@ struct __db_lockregion; typedef struct __db_lockregion DB_LOCKREGION;
struct __db_lockreq; typedef struct __db_lockreq DB_LOCKREQ;
struct __db_locktab; typedef struct __db_locktab DB_LOCKTAB;
struct __db_log; typedef struct __db_log DB_LOG;
+struct __db_log_stat; typedef struct __db_log_stat DB_LOG_STAT;
struct __db_lsn; typedef struct __db_lsn DB_LSN;
struct __db_mpool; typedef struct __db_mpool DB_MPOOL;
struct __db_mpool_fstat;typedef struct __db_mpool_fstat DB_MPOOL_FSTAT;
@@ -122,6 +129,31 @@ struct __db_dbt {
};
/*
+ * DB configuration. There are a set of functions which the application
+ * can replace with its own versions.
+ */
+#define DB_FUNC_CALLOC 1 /* ANSI C calloc. */
+#define DB_FUNC_CLOSE 2 /* POSIX 1003.1 close. */
+#define DB_FUNC_DIRFREE 3 /* DB: free directory list. */
+#define DB_FUNC_DIRLIST 4 /* DB: create directory list. */
+#define DB_FUNC_EXISTS 5 /* DB: return if file exists. */
+#define DB_FUNC_FREE 6 /* ANSI C free. */
+#define DB_FUNC_FSYNC 7 /* POSIX 1003.1 fsync. */
+#define DB_FUNC_IOINFO 8 /* DB: return file I/O information. */
+#define DB_FUNC_MALLOC 9 /* ANSI C malloc. */
+#define DB_FUNC_MAP 10 /* DB: map file into shared memory. */
+#define DB_FUNC_OPEN 11 /* POSIX 1003.1 open. */
+#define DB_FUNC_READ 12 /* POSIX 1003.1 read. */
+#define DB_FUNC_REALLOC 13 /* ANSI C realloc. */
+#define DB_FUNC_SEEK 14 /* POSIX 1003.1 lseek. */
+#define DB_FUNC_SLEEP 15 /* DB: sleep secs/usecs. */
+#define DB_FUNC_STRDUP 16 /* ANSI C strdup. */
+#define DB_FUNC_UNLINK 17 /* POSIX 1003.1 unlink. */
+#define DB_FUNC_UNMAP 18 /* DB: unmap shared memory file. */
+#define DB_FUNC_WRITE 19 /* POSIX 1003.1 write. */
+#define DB_FUNC_YIELD 20 /* DB: yield thread to scheduler. */
+
+/*
* Database configuration and initialization.
*/
/*
@@ -134,21 +166,20 @@ struct __db_dbt {
/*
* Flags understood by db_appinit(3).
*
- * DB_APP_INIT and DB_MUTEXDEBUG are internal only, and not documented.
+ * DB_MUTEXDEBUG is internal only, and not documented.
*/
/* 0x00007 COMMON MASK. */
-#define DB_APP_INIT 0x00008 /* Appinit called, paths initialized. */
-#define DB_INIT_LOCK 0x00010 /* Initialize locking. */
-#define DB_INIT_LOG 0x00020 /* Initialize logging. */
-#define DB_INIT_MPOOL 0x00040 /* Initialize mpool. */
-#define DB_INIT_TXN 0x00080 /* Initialize transactions. */
-#define DB_MPOOL_PRIVATE 0x00100 /* Mpool: private memory pool. */
-#define DB_MUTEXDEBUG 0x00200 /* Do not get/set mutexes in regions. */
-#define DB_RECOVER 0x00400 /* Run normal recovery. */
-#define DB_RECOVER_FATAL 0x00800 /* Run catastrophic recovery. */
-#define DB_TXN_NOSYNC 0x01000 /* Do not sync log on commit. */
-#define DB_USE_ENVIRON 0x02000 /* Use the environment. */
-#define DB_USE_ENVIRON_ROOT 0x04000 /* Use the environment if root. */
+#define DB_INIT_LOCK 0x00008 /* Initialize locking. */
+#define DB_INIT_LOG 0x00010 /* Initialize logging. */
+#define DB_INIT_MPOOL 0x00020 /* Initialize mpool. */
+#define DB_INIT_TXN 0x00040 /* Initialize transactions. */
+#define DB_MPOOL_PRIVATE 0x00080 /* Mpool: private memory pool. */
+#define DB_MUTEXDEBUG 0x00100 /* Do not get/set mutexes in regions. */
+#define DB_RECOVER 0x00200 /* Run normal recovery. */
+#define DB_RECOVER_FATAL 0x00400 /* Run catastrophic recovery. */
+#define DB_TXN_NOSYNC 0x00800 /* Do not sync log on commit. */
+#define DB_USE_ENVIRON 0x01000 /* Use the environment. */
+#define DB_USE_ENVIRON_ROOT 0x02000 /* Use the environment if root. */
/* CURRENTLY UNUSED LOCK FLAGS. */
#define DB_TXN_LOCK_2PL 0x00000 /* Two-phase locking. */
@@ -209,7 +240,6 @@ struct __db_env {
int lk_modes; /* Number of lock modes in table. */
unsigned int lk_max; /* Maximum number of locks. */
u_int32_t lk_detect; /* Deadlock detect on every conflict. */
- int (*db_yield) __P((void)); /* Yield function for threads. */
/* Logging. */
DB_LOG *lg_info; /* Return from log_open(). */
@@ -226,6 +256,9 @@ struct __db_env {
int (*tx_recover) /* Dispatch function for recovery. */
__P((DB_LOG *, DBT *, DB_LSN *, int, void *));
+#define DB_ENV_APPINIT 0x01 /* Paths initialized by db_appinit(). */
+#define DB_ENV_STANDALONE 0x02 /* Test: freestanding environment. */
+#define DB_ENV_THREAD 0x04 /* DB_ENV is multi-threaded. */
u_int32_t flags; /* Flags. */
};
@@ -301,7 +334,7 @@ struct __db_info {
#define DB_CURRENT 0x000010 /* c_get(), c_put(), log_get() */
#define DB_FIRST 0x000020 /* c_get(), log_get() */
#define DB_FLUSH 0x000040 /* log_put() */
-#define DB_GET_RECNO 0x000080 /* c_get() */
+#define DB_GET_RECNO 0x000080 /* get(), c_get() */
#define DB_KEYFIRST 0x000100 /* c_put() */
#define DB_KEYLAST 0x000200 /* c_put() */
#define DB_LAST 0x000400 /* c_get(), log_get() */
@@ -312,7 +345,7 @@ struct __db_info {
#define DB_RECORDCOUNT 0x008000 /* stat() */
#define DB_SET 0x010000 /* c_get(), log_get() */
#define DB_SET_RANGE 0x020000 /* c_get() */
-#define DB_SET_RECNO 0x040000 /* get(), c_get() */
+#define DB_SET_RECNO 0x040000 /* c_get() */
/* DB (user visible) error return codes. */
#define DB_INCOMPLETE ( -1) /* Sync didn't finish. */
@@ -472,6 +505,8 @@ struct __db_bt_stat {
u_int32_t bt_get; /* Items retrieved. */
u_int32_t bt_cache_hit; /* Hits in fast-insert code. */
u_int32_t bt_cache_miss; /* Misses in fast-insert code. */
+ u_int32_t bt_magic; /* Magic number. */
+ u_int32_t bt_version; /* Version number. */
};
#if defined(__cplusplus)
@@ -479,6 +514,7 @@ extern "C" {
#endif
int db_appinit __P((const char *, char * const *, DB_ENV *, int));
int db_appexit __P((DB_ENV *));
+int db_jump_set __P((void *, int));
int db_open __P((const char *, DBTYPE, int, int, DB_ENV *, DB_INFO *, DB **));
char *db_version __P((int *, int *, int *));
#if defined(__cplusplus)
@@ -576,6 +612,22 @@ struct __db_lsn {
u_int32_t offset; /* File offset. */
};
+/* Log statistics structure. */
+struct __db_log_stat {
+ u_int32_t st_magic; /* Log file magic number. */
+ u_int32_t st_version; /* Log file version number. */
+ int st_mode; /* Log file mode. */
+ u_int32_t st_lg_max; /* Maximum log file size. */
+ u_int32_t st_w_bytes; /* Bytes to log. */
+ u_int32_t st_w_mbytes; /* Megabytes to log. */
+ u_int32_t st_wc_bytes; /* Bytes to log since checkpoint. */
+ u_int32_t st_wc_mbytes; /* Megabytes to log since checkpoint. */
+ u_int32_t st_wcount; /* Total syncs to the log. */
+ u_int32_t st_scount; /* Total writes to the log. */
+ u_int32_t st_region_wait; /* Region lock granted after wait. */
+ u_int32_t st_region_nowait; /* Region lock granted without wait. */
+};
+
#if defined(__cplusplus)
extern "C" {
#endif
@@ -588,6 +640,7 @@ int log_get __P((DB_LOG *, DB_LSN *, DBT *, int));
int log_open __P((const char *, int, int, DB_ENV *, DB_LOG **));
int log_put __P((DB_LOG *, DB_LSN *, const DBT *, int));
int log_register __P((DB_LOG *, DB *, const char *, DBTYPE, u_int32_t *));
+int log_stat __P((DB_LOG *, DB_LOG_STAT **, void *(*)(size_t)));
int log_unlink __P((const char *, int, DB_ENV *));
int log_unregister __P((DB_LOG *, u_int32_t));
#if defined(__cplusplus)
@@ -610,30 +663,35 @@ int log_unregister __P((DB_LOG *, u_int32_t));
/* Mpool statistics structure. */
struct __db_mpool_stat {
size_t st_cachesize; /* Cache size. */
- unsigned long st_cache_hit; /* Pages found in the cache. */
- unsigned long st_cache_miss; /* Pages not found in the cache. */
- unsigned long st_map; /* Pages from mapped files. */
- unsigned long st_page_create; /* Pages created in the cache. */
- unsigned long st_page_in; /* Pages read in. */
- unsigned long st_page_out; /* Pages written out. */
- unsigned long st_ro_evict; /* Read-only pages evicted. */
- unsigned long st_rw_evict; /* Read-write pages evicted. */
- unsigned long st_hash_buckets; /* Number of hash buckets. */
- unsigned long st_hash_searches; /* Total hash chain searches. */
- unsigned long st_hash_longest; /* Longest hash chain searched. */
- unsigned long st_hash_examined; /* Total hash entries searched. */
+ u_int32_t st_cache_hit; /* Pages found in the cache. */
+ u_int32_t st_cache_miss; /* Pages not found in the cache. */
+ u_int32_t st_map; /* Pages from mapped files. */
+ u_int32_t st_page_create; /* Pages created in the cache. */
+ u_int32_t st_page_in; /* Pages read in. */
+ u_int32_t st_page_out; /* Pages written out. */
+ u_int32_t st_ro_evict; /* Clean pages forced from the cache. */
+ u_int32_t st_rw_evict; /* Dirty pages forced from the cache. */
+ u_int32_t st_hash_buckets; /* Number of hash buckets. */
+ u_int32_t st_hash_searches; /* Total hash chain searches. */
+ u_int32_t st_hash_longest; /* Longest hash chain searched. */
+ u_int32_t st_hash_examined; /* Total hash entries searched. */
+ u_int32_t st_page_clean; /* Clean pages. */
+ u_int32_t st_page_dirty; /* Dirty pages. */
+ u_int32_t st_page_trickle; /* Pages written by memp_trickle. */
+ u_int32_t st_region_wait; /* Region lock granted after wait. */
+ u_int32_t st_region_nowait; /* Region lock granted without wait. */
};
/* Mpool file statistics structure. */
struct __db_mpool_fstat {
char *file_name; /* File name. */
size_t st_pagesize; /* Page size. */
- unsigned long st_cache_hit; /* Pages found in the cache. */
- unsigned long st_cache_miss; /* Pages not found in the cache. */
- unsigned long st_map; /* Pages from mapped files. */
- unsigned long st_page_create; /* Pages created in the cache. */
- unsigned long st_page_in; /* Pages read in. */
- unsigned long st_page_out; /* Pages written out. */
+ u_int32_t st_cache_hit; /* Pages found in the cache. */
+ u_int32_t st_cache_miss; /* Pages not found in the cache. */
+ u_int32_t st_map; /* Pages from mapped files. */
+ u_int32_t st_page_create; /* Pages created in the cache. */
+ u_int32_t st_page_in; /* Pages read in. */
+ u_int32_t st_page_out; /* Pages written out. */
};
#if defined(__cplusplus)
@@ -654,6 +712,7 @@ int memp_register __P((DB_MPOOL *, int,
int memp_stat __P((DB_MPOOL *,
DB_MPOOL_STAT **, DB_MPOOL_FSTAT ***, void *(*)(size_t)));
int memp_sync __P((DB_MPOOL *, DB_LSN *));
+int memp_trickle __P((DB_MPOOL *, int, int *));
int memp_unlink __P((const char *, int, DB_ENV *));
#if defined(__cplusplus)
};
diff --git a/db2/include/db_am.h b/db2/include/db_am.h
index 5814ff88c3..0ea24be667 100644
--- a/db2/include/db_am.h
+++ b/db2/include/db_am.h
@@ -4,7 +4,7 @@
* Copyright (c) 1996, 1997
* Sleepycat Software. All rights reserved.
*
- * @(#)db_am.h 10.6 (Sleepycat) 8/27/97
+ * @(#)db_am.h 10.7 (Sleepycat) 10/25/97
*/
#ifndef _DB_AM_H
#define _DB_AM_H
@@ -49,7 +49,7 @@
}
#define REC_CLOSE { \
if (argp != NULL) \
- free (argp); \
+ __db_free(argp); \
if (file_dbp != NULL) { \
F_CLR(file_dbp, DB_AM_RECOVER); \
if (F_ISSET(file_dbp, DB_AM_THREAD)) \
@@ -67,7 +67,7 @@
}
#define REC_NOOP_CLOSE { \
if (argp != NULL) \
- free (argp); \
+ __db_free(argp); \
return (ret); \
}
diff --git a/db2/include/db_auto.h b/db2/include/db_auto.h
index 7478173740..4c7b4da970 100644
--- a/db2/include/db_auto.h
+++ b/db2/include/db_auto.h
@@ -59,6 +59,7 @@ typedef struct _db_ovref_args {
DB_LSN prev_lsn;
u_int32_t fileid;
db_pgno_t pgno;
+ int32_t adjust;
DB_LSN lsn;
} __db_ovref_args;
diff --git a/db2/include/db_cxx.h b/db2/include/db_cxx.h
index 611d967ef9..01d1231092 100644
--- a/db2/include/db_cxx.h
+++ b/db2/include/db_cxx.h
@@ -4,12 +4,11 @@
* Copyright (c) 1997
* Sleepycat Software. All rights reserved.
*
- * @(#)db_cxx.h 10.8 (Sleepycat) 9/20/97
+ * @(#)db_cxx.h 10.12 (Sleepycat) 10/25/97
*/
#ifndef _DB_CXX_H_
#define _DB_CXX_H_
-
//
// C++ assumptions:
//
@@ -264,7 +263,7 @@ public:
// Normally these would be called register and unregister to
// parallel the C interface, but "register" is a reserved word.
//
- int db_register(Db *dbp, const char *name, u_int32_t *fidp);
+ int db_register(Db *dbp, const char *name, DBTYPE type, u_int32_t *fidp);
int db_unregister(u_int32_t fid);
// Create or remove new log files
@@ -353,6 +352,7 @@ public:
int stat(DB_MPOOL_STAT **gsp, DB_MPOOL_FSTAT ***fsp,
void *(*db_malloc)(size_t));
int sync(DbLsn *lsn);
+ int trickle(int pct, int *nwrotep);
// Create or remove new mpool files
//
@@ -598,6 +598,11 @@ public:
//
int appinit(const char *homeDir, char *const *db_config, int flags);
+ // Called automatically when DbEnv is destroyed, or can be
+ // called at any time to shut down Db.
+ //
+ int appexit();
+
////////////////////////////////////////////////////////////////
// simple get/set access methods
//
@@ -675,11 +680,6 @@ public:
u_int32_t get_lk_detect() const;
void set_lk_detect(u_int32_t);
- // Yield function for threads.
- typedef int (*db_yield_fcn) (void);
- db_yield_fcn get_yield() const;
- void set_yield(db_yield_fcn);
-
////////////////////////////////////////////////////////////////
// Logging.
@@ -783,7 +783,7 @@ class _exported Db
public:
int close(int flags);
int cursor(DbTxn *txnid, Dbc **cursorp);
- int del(Dbt *key, DbTxn *txnid);
+ int del(DbTxn *txnid, Dbt *key, int flags);
int fd(int *fdp);
int get(DbTxn *txnid, Dbt *key, Dbt *data, int flags);
int put(DbTxn *txnid, Dbt *key, Dbt *data, int flags);
@@ -884,5 +884,4 @@ private:
Dbc(const Dbc &);
Dbc &operator = (const Dbc &);
};
-
#endif /* !_DB_CXX_H_ */
diff --git a/db2/include/db_ext.h b/db2/include/db_ext.h
index b18b10ff7f..f9b3b3a214 100644
--- a/db2/include/db_ext.h
+++ b/