up

git-svn-id: file:///svn/tokudb@515 c7de825b-a66e-492c-adef-691d508d4ae1

buildheader/Makefile

 CFLAGS = -Wall -W -O2 -Werror -g
-MYSQL_H = -I../../mysql-5.0.27/mysql-5.0.27/bdb/build_unix/
+MYSQL_H = -I../../berkeleydb/db-4.1.25/build_unix/
 runs: runs_mysql runs_installed
 hs: db.h_4_3 db.h_4_1
 # the mysql versions use the header in the mysql distribution.
@@ -35,5 +35,8 @@ clean:
 install_4_1: db.h_4_1
 	cp db.h_4_1 ../include/db.h
 
-# Note: To make the ompile work, you must cd to the ../../mysql-5.0.27/mysql-5.0.27/bdb/build_unix
+# Note: To make the compile work, you must cd to the ../../berkeleydb/db-4.1.25/build_unix
 # and do ../dist/configure
+
+# to build mysql-5.0.27 with berkeley db 4.1.25
+# ./configure --with-berkeley-db=../../berkeleydb/db-4.1.25/build_unix

buildheader/db.h_4_1

@@ -9,9 +9,9 @@ extern "C" {
 #endif
 #define DB_VERSION_MAJOR 4
 #define DB_VERSION_MINOR 1
-#define DB_VERSION_PATCH 24
+#define DB_VERSION_PATCH 25
 #ifndef _TOKUDB_WRAP_H
-#define DB_VERSION_STRING "Tokutek: TokuDB 4.1.24"
+#define DB_VERSION_STRING "Tokutek: TokuDB 4.1.25"
 #else
 #define DB_VERSION_STRING_ydb "Tokutek: TokuDB (wrapped bdb)"
 #endif
@@ -49,6 +49,7 @@ typedef enum {
 #define DB_LOCK_OLDEST 6
 #define DB_LOCK_RANDOM 7
 #define DB_DUP 2
+#define DB_DUPSORT 4
 #define DB_NOOVERWRITE 23
 #define DB_INIT_LOCK 4096
 #define DB_INIT_LOG 8192
@@ -81,50 +82,52 @@ struct __toku_db_btree_stat {
 };
 struct __toku_db_env {
   struct __toku_db_env_internal *i;
-  void* __toku_dummy0[45];
-  char __toku_dummy1[64];
-  int  (*close) (DB_ENV *, u_int32_t); /* 32-bit offset=248 size=4, 64=bit offset=432 size=8 */
-  void* __toku_dummy2[2];
-  void (*err) (const DB_ENV *, int, const char *, ...); /* 32-bit offset=260 size=4, 64=bit offset=456 size=8 */
-  void* __toku_dummy3[1];
-  int  (*open) (DB_ENV *, const char *, u_int32_t, int); /* 32-bit offset=268 size=4, 64=bit offset=472 size=8 */
+  void* __toku_dummy0[8];
+  void *app_private; /* 32-bit offset=36 size=4, 64=bit offset=72 size=8 */
+  void* __toku_dummy1[35];
+  char __toku_dummy2[64];
+  int  (*close) (DB_ENV *, u_int32_t); /* 32-bit offset=244 size=4, 64=bit offset=424 size=8 */
+  void* __toku_dummy3[2];
+  void (*err) (const DB_ENV *, int, const char *, ...); /* 32-bit offset=256 size=4, 64=bit offset=448 size=8 */
   void* __toku_dummy4[1];
-  int  (*set_data_dir) (DB_ENV *, const char *); /* 32-bit offset=276 size=4, 64=bit offset=488 size=8 */
-  void* __toku_dummy5[3];
-  void (*set_errcall) (DB_ENV *, void (*)(const char *, char *)); /* 32-bit offset=292 size=4, 64=bit offset=520 size=8 */
-  void* __toku_dummy6[1];
-  void (*set_errpfx) (DB_ENV *, const char *); /* 32-bit offset=300 size=4, 64=bit offset=536 size=8 */
+  int  (*open) (DB_ENV *, const char *, u_int32_t, int); /* 32-bit offset=264 size=4, 64=bit offset=464 size=8 */
+  void* __toku_dummy5[1];
+  int  (*set_data_dir) (DB_ENV *, const char *); /* 32-bit offset=272 size=4, 64=bit offset=480 size=8 */
+  void* __toku_dummy6[3];
+  void (*set_errcall) (DB_ENV *, void (*)(const char *, char *)); /* 32-bit offset=288 size=4, 64=bit offset=512 size=8 */
   void* __toku_dummy7[1];
-  int  (*set_flags) (DB_ENV *, u_int32_t, int); /* 32-bit offset=308 size=4, 64=bit offset=552 size=8 */
-  void* __toku_dummy8[5];
-  int  (*set_tmp_dir) (DB_ENV *, const char *); /* 32-bit offset=332 size=4, 64=bit offset=600 size=8 */
-  int  (*set_verbose) (DB_ENV *, u_int32_t, int); /* 32-bit offset=336 size=4, 64=bit offset=608 size=8 */
-  void* __toku_dummy9[1];
-  int  (*set_lg_bsize) (DB_ENV *, u_int32_t); /* 32-bit offset=344 size=4, 64=bit offset=624 size=8 */
-  int  (*set_lg_dir) (DB_ENV *, const char *); /* 32-bit offset=348 size=4, 64=bit offset=632 size=8 */
-  int  (*set_lg_max) (DB_ENV *, u_int32_t); /* 32-bit offset=352 size=4, 64=bit offset=640 size=8 */
+  void (*set_errpfx) (DB_ENV *, const char *); /* 32-bit offset=296 size=4, 64=bit offset=528 size=8 */
+  void* __toku_dummy8[1];
+  int  (*set_flags) (DB_ENV *, u_int32_t, int); /* 32-bit offset=304 size=4, 64=bit offset=544 size=8 */
+  void* __toku_dummy9[4];
+  int  (*set_tmp_dir) (DB_ENV *, const char *); /* 32-bit offset=324 size=4, 64=bit offset=584 size=8 */
+  int  (*set_verbose) (DB_ENV *, u_int32_t, int); /* 32-bit offset=328 size=4, 64=bit offset=592 size=8 */
   void* __toku_dummy10[1];
-  int  (*log_archive) (DB_ENV *, char **[], u_int32_t); /* 32-bit offset=360 size=4, 64=bit offset=656 size=8 */
-  void* __toku_dummy11[2];
-  int  (*log_flush) (DB_ENV *, const DB_LSN *); /* 32-bit offset=372 size=4, 64=bit offset=680 size=8 */
-  void* __toku_dummy12[4];
-  int  (*set_lk_detect) (DB_ENV *, u_int32_t); /* 32-bit offset=392 size=4, 64=bit offset=720 size=8 */
-  int  (*set_lk_max) (DB_ENV *, u_int32_t); /* 32-bit offset=396 size=4, 64=bit offset=728 size=8 */
-  void* __toku_dummy13[15];
-  int  (*set_cachesize) (DB_ENV *, u_int32_t, u_int32_t, int); /* 32-bit offset=460 size=4, 64=bit offset=856 size=8 */
-  void* __toku_dummy14[21];
-  int  (*txn_begin) (DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t); /* 32-bit offset=548 size=4, 64=bit offset=1032 size=8 */
-  int  (*txn_checkpoint) (DB_ENV *, u_int32_t, u_int32_t, u_int32_t); /* 32-bit offset=552 size=4, 64=bit offset=1040 size=8 */
-  void* __toku_dummy15[2];
-  int  (*txn_stat) (DB_ENV *, DB_TXN_STAT **, u_int32_t); /* 32-bit offset=564 size=4, 64=bit offset=1064 size=8 */
-  void* __toku_dummy16[2]; /* Padding at the end */ 
-  char __toku_dummy17[8];  /* Padding at the end */ 
+  int  (*set_lg_bsize) (DB_ENV *, u_int32_t); /* 32-bit offset=336 size=4, 64=bit offset=608 size=8 */
+  int  (*set_lg_dir) (DB_ENV *, const char *); /* 32-bit offset=340 size=4, 64=bit offset=616 size=8 */
+  int  (*set_lg_max) (DB_ENV *, u_int32_t); /* 32-bit offset=344 size=4, 64=bit offset=624 size=8 */
+  void* __toku_dummy11[1];
+  int  (*log_archive) (DB_ENV *, char **[], u_int32_t); /* 32-bit offset=352 size=4, 64=bit offset=640 size=8 */
+  void* __toku_dummy12[2];
+  int  (*log_flush) (DB_ENV *, const DB_LSN *); /* 32-bit offset=364 size=4, 64=bit offset=664 size=8 */
+  void* __toku_dummy13[4];
+  int  (*set_lk_detect) (DB_ENV *, u_int32_t); /* 32-bit offset=384 size=4, 64=bit offset=704 size=8 */
+  int  (*set_lk_max) (DB_ENV *, u_int32_t); /* 32-bit offset=388 size=4, 64=bit offset=712 size=8 */
+  void* __toku_dummy14[15];
+  int  (*set_cachesize) (DB_ENV *, u_int32_t, u_int32_t, int); /* 32-bit offset=452 size=4, 64=bit offset=840 size=8 */
+  void* __toku_dummy15[21];
+  int  (*txn_begin) (DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t); /* 32-bit offset=540 size=4, 64=bit offset=1016 size=8 */
+  int  (*txn_checkpoint) (DB_ENV *, u_int32_t, u_int32_t, u_int32_t); /* 32-bit offset=544 size=4, 64=bit offset=1024 size=8 */
+  void* __toku_dummy16[2];
+  int  (*txn_stat) (DB_ENV *, DB_TXN_STAT **, u_int32_t); /* 32-bit offset=556 size=4, 64=bit offset=1048 size=8 */
+  void* __toku_dummy17[2]; /* Padding at the end */ 
+  char __toku_dummy18[8];  /* Padding at the end */ 
 };
 struct __toku_db_key_range {
   double less; /* 32-bit offset=0 size=8, 64=bit offset=0 size=8 */
   double equal; /* 32-bit offset=8 size=8, 64=bit offset=8 size=8 */
   double greater; /* 32-bit offset=16 size=8, 64=bit offset=16 size=8 */
-  void* __toku_dummy0[128]; /* Padding at the end */ 
+  void* __toku_dummy0[126]; /* Padding at the end */ 
   char __toku_dummy1[48];  /* Padding at the end */ 
 };
 struct __toku_db_lsn {
@@ -134,28 +137,33 @@ struct __toku_db {
   struct __toku_db_internal *i;
   void* __toku_dummy0[3];
   void *app_private; /* 32-bit offset=16 size=4, 64=bit offset=32 size=8 */
-  void* __toku_dummy1[39];
+  DB_ENV *dbenv; /* 32-bit offset=20 size=4, 64=bit offset=40 size=8 */
+  void* __toku_dummy1[35];
   char __toku_dummy2[96];
-  int (*close) (DB*, u_int32_t); /* 32-bit offset=272 size=4, 64=bit offset=448 size=8 */
-  int (*cursor) (DB *, DB_TXN *, DBC **, u_int32_t); /* 32-bit offset=276 size=4, 64=bit offset=456 size=8 */
-  int (*del) (DB *, DB_TXN *, DBT *, u_int32_t); /* 32-bit offset=280 size=4, 64=bit offset=464 size=8 */
+  int (*close) (DB*, u_int32_t); /* 32-bit offset=260 size=4, 64=bit offset=424 size=8 */
+  int (*cursor) (DB *, DB_TXN *, DBC **, u_int32_t); /* 32-bit offset=264 size=4, 64=bit offset=432 size=8 */
+  int (*del) (DB *, DB_TXN *, DBT *, u_int32_t); /* 32-bit offset=268 size=4, 64=bit offset=440 size=8 */
   void* __toku_dummy3[3];
-  int (*get) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t); /* 32-bit offset=296 size=4, 64=bit offset=496 size=8 */
+  int (*get) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t); /* 32-bit offset=284 size=4, 64=bit offset=472 size=8 */
   void* __toku_dummy4[4];
-  int (*key_range) (DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t); /* 32-bit offset=316 size=4, 64=bit offset=536 size=8 */
-  int (*open) (DB *, DB_TXN *, const char *, const char *, DBTYPE, u_int32_t, int); /* 32-bit offset=320 size=4, 64=bit offset=544 size=8 */
-  int (*put) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t); /* 32-bit offset=324 size=4, 64=bit offset=552 size=8 */
-  int (*remove) (DB *, const char *, const char *, u_int32_t); /* 32-bit offset=328 size=4, 64=bit offset=560 size=8 */
-  int (*rename) (DB *, const char *, const char *, const char *, u_int32_t); /* 32-bit offset=332 size=4, 64=bit offset=568 size=8 */
-  void* __toku_dummy5[11];
-  int (*set_flags) (DB *, u_int32_t); /* 32-bit offset=380 size=4, 64=bit offset=664 size=8 */
-  void* __toku_dummy6[3];
-  int (*stat) (DB *, void *, u_int32_t); /* 32-bit offset=396 size=4, 64=bit offset=696 size=8 */
-  void* __toku_dummy7[2];
-  int (*verify) (DB *, const char *, const char *, FILE *, u_int32_t); /* 32-bit offset=408 size=4, 64=bit offset=720 size=8 */
-  int (*set_bt_compare) (DB *, int (*)(DB *, const DBT *, const DBT *)); /* 32-bit offset=412 size=4, 64=bit offset=728 size=8 */
-  void* __toku_dummy8[15]; /* Padding at the end */ 
-  char __toku_dummy9[8];  /* Padding at the end */ 
+  int (*key_range) (DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t); /* 32-bit offset=304 size=4, 64=bit offset=512 size=8 */
+  int (*open) (DB *, DB_TXN *, const char *, const char *, DBTYPE, u_int32_t, int); /* 32-bit offset=308 size=4, 64=bit offset=520 size=8 */
+  int (*put) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t); /* 32-bit offset=312 size=4, 64=bit offset=528 size=8 */
+  int (*remove) (DB *, const char *, const char *, u_int32_t); /* 32-bit offset=316 size=4, 64=bit offset=536 size=8 */
+  int (*rename) (DB *, const char *, const char *, const char *, u_int32_t); /* 32-bit offset=320 size=4, 64=bit offset=544 size=8 */
+  void* __toku_dummy5[5];
+  int (*set_dup_compare) (DB *, int (*)(DB *, const DBT *, const DBT *)); /* 32-bit offset=344 size=4, 64=bit offset=592 size=8 */
+  void* __toku_dummy6[5];
+  int (*set_flags) (DB *, u_int32_t); /* 32-bit offset=368 size=4, 64=bit offset=640 size=8 */
+  void* __toku_dummy7[1];
+  int (*set_pagesize) (DB *, u_int32_t); /* 32-bit offset=376 size=4, 64=bit offset=656 size=8 */
+  void* __toku_dummy8[1];
+  int (*stat) (DB *, void *, u_int32_t); /* 32-bit offset=384 size=4, 64=bit offset=672 size=8 */
+  void* __toku_dummy9[2];
+  int (*verify) (DB *, const char *, const char *, FILE *, u_int32_t); /* 32-bit offset=396 size=4, 64=bit offset=696 size=8 */
+  int (*set_bt_compare) (DB *, int (*)(DB *, const DBT *, const DBT *)); /* 32-bit offset=400 size=4, 64=bit offset=704 size=8 */
+  void* __toku_dummy10[15]; /* Padding at the end */ 
+  char __toku_dummy11[8];  /* Padding at the end */ 
 };
 struct __toku_db_txn_active {
   u_int32_t txnid; /* 32-bit offset=0 size=4, 64=bit offset=0 size=4 */
@@ -183,13 +191,13 @@ struct __toku_db_txn_stat {
 };
 struct __toku_dbc {
   struct __toku_dbc_internal *i;
-  void* __toku_dummy0[24];
+  void* __toku_dummy0[20];
   char __toku_dummy1[104];
-  int (*c_close) (DBC *); /* 32-bit offset=204 size=4, 64=bit offset=304 size=8 */
+  int (*c_close) (DBC *); /* 32-bit offset=188 size=4, 64=bit offset=272 size=8 */
   void* __toku_dummy2[1];
-  int (*c_del) (DBC *, u_int32_t); /* 32-bit offset=212 size=4, 64=bit offset=320 size=8 */
+  int (*c_del) (DBC *, u_int32_t); /* 32-bit offset=196 size=4, 64=bit offset=288 size=8 */
   void* __toku_dummy3[1];
-  int (*c_get) (DBC *, DBT *, DBT *, u_int32_t); /* 32-bit offset=220 size=4, 64=bit offset=336 size=8 */
+  int (*c_get) (DBC *, DBT *, DBT *, u_int32_t); /* 32-bit offset=204 size=4, 64=bit offset=304 size=8 */
   void* __toku_dummy4[11]; /* Padding at the end */ 
 };
 struct __toku_dbt {
@@ -197,8 +205,7 @@ struct __toku_dbt {
   u_int32_t size; /* 32-bit offset=4 size=4, 64=bit offset=8 size=4 */
   u_int32_t ulen; /* 32-bit offset=8 size=4, 64=bit offset=12 size=4 */
   char __toku_dummy0[8];
-  void*app_private; /* 32-bit offset=20 size=4, 64=bit offset=24 size=8 */
-  u_int32_t flags; /* 32-bit offset=24 size=4, 64=bit offset=32 size=4 */
+  u_int32_t flags; /* 32-bit offset=20 size=4, 64=bit offset=24 size=4 */
   /* 4 more bytes of alignment in the 64-bit case. */
 };
 #ifdef _TOKUDB_WRAP_H

buildheader/db.h_4_3

@@ -13,7 +13,7 @@ extern "C" {
 #ifndef _TOKUDB_WRAP_H
 #define DB_VERSION_STRING "Tokutek: TokuDB 4.3.29"
 #else
-#define DB_VERSION_STRING "Tokutek: TokuDB (wrapped bdb)"
+#define DB_VERSION_STRING_ydb "Tokutek: TokuDB (wrapped bdb)"
 #endif
 typedef struct __toku_db_btree_stat DB_BTREE_STAT;
 typedef struct __toku_db_env DB_ENV;
@@ -28,6 +28,7 @@ typedef struct __toku_dbt DBT;
 typedef enum {
  DB_BTREE=1
 } DBTYPE;
+#ifndef _TOKUDB_WRAP_H
 #define DB_VERB_DEADLOCK 1
 #define DB_VERB_RECOVERY 2
 #define DB_VERB_REPLICATION 4
@@ -48,6 +49,7 @@ typedef enum {
 #define DB_LOCK_OLDEST 7
 #define DB_LOCK_RANDOM 8
 #define DB_DUP 2
+#define DB_DUPSORT 4
 #define DB_NOOVERWRITE 22
 #define DB_INIT_LOCK 8192
 #define DB_INIT_LOG 16384
@@ -67,6 +69,7 @@ typedef enum {
 #define DB_SET 28
 #define DB_SET_RANGE 30
 #define DB_RMW 536870912
+#endif
 /* in wrap mode, top-level function txn_begin is renamed, but the field isn't renamed, so we have to hack it here.*/
 #ifdef _TOKUDB_WRAP_H
 #undef txn_begin
@@ -148,16 +151,20 @@ struct __toku_db {
   int (*put) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t); /* 32-bit offset=372 size=4, 64=bit offset=648 size=8 */
   int (*remove) (DB *, const char *, const char *, u_int32_t); /* 32-bit offset=376 size=4, 64=bit offset=656 size=8 */
   int (*rename) (DB *, const char *, const char *, const char *, u_int32_t); /* 32-bit offset=380 size=4, 64=bit offset=664 size=8 */
-  void* __toku_dummy5[10];
+  void* __toku_dummy5[4];
+  int (*set_dup_compare) (DB *, int (*)(DB *, const DBT *, const DBT *)); /* 32-bit offset=400 size=4, 64=bit offset=704 size=8 */
+  void* __toku_dummy6[5];
   int (*set_flags) (DB *, u_int32_t); /* 32-bit offset=424 size=4, 64=bit offset=752 size=8 */
-  void* __toku_dummy6[6];
+  void* __toku_dummy7[4];
+  int (*set_pagesize) (DB *, u_int32_t); /* 32-bit offset=444 size=4, 64=bit offset=792 size=8 */
+  void* __toku_dummy8[1];
   int (*stat) (DB *, void *, u_int32_t); /* 32-bit offset=452 size=4, 64=bit offset=808 size=8 */
-  void* __toku_dummy7[3];
+  void* __toku_dummy9[3];
   int (*verify) (DB *, const char *, const char *, FILE *, u_int32_t); /* 32-bit offset=468 size=4, 64=bit offset=840 size=8 */
-  void* __toku_dummy8[1];
+  void* __toku_dummy10[1];
   int (*set_bt_compare) (DB *, int (*)(DB *, const DBT *, const DBT *)); /* 32-bit offset=476 size=4, 64=bit offset=856 size=8 */
-  void* __toku_dummy9[23]; /* Padding at the end */ 
-  char __toku_dummy10[8];  /* Padding at the end */ 
+  void* __toku_dummy11[23]; /* Padding at the end */ 
+  char __toku_dummy12[8];  /* Padding at the end */ 
 };
 struct __toku_db_txn_active {
   u_int32_t txnid; /* 32-bit offset=0 size=4, 64=bit offset=0 size=4 */

buildheader/make_db_h.c

@@ -50,6 +50,7 @@ void print_defines (void) {
     dodefine(DB_LOCK_RANDOM);
 
     dodefine(DB_DUP);
+    dodefine(DB_DUPSORT);
 
     dodefine(DB_NOOVERWRITE);
 

buildheader/sample_offsets.c

@@ -62,6 +62,7 @@ void sample_db_btree_stat_offsets (void) {
 
 void sample_db_env_offsets (void) {
     field_counter=0;
+    STRUCT_SETUP(DB_ENV, app_private, "void *%s");
     STRUCT_SETUP(DB_ENV, close, "int  (*%s) (DB_ENV *, u_int32_t)");
     STRUCT_SETUP(DB_ENV, err, "void (*%s) (const DB_ENV *, int, const char *, ...)");
     STRUCT_SETUP(DB_ENV, log_archive, "int  (*%s) (DB_ENV *, char **[], u_int32_t)");
@@ -105,6 +106,7 @@ void sample_db_offsets (void) {
     STRUCT_SETUP(DB, app_private,    "void *%s");
     STRUCT_SETUP(DB, close,          "int (*%s) (DB*, u_int32_t)");
     STRUCT_SETUP(DB, cursor,         "int (*%s) (DB *, DB_TXN *, DBC **, u_int32_t)");
+    STRUCT_SETUP(DB, dbenv,          "DB_ENV *%s");
     STRUCT_SETUP(DB, del,            "int (*%s) (DB *, DB_TXN *, DBT *, u_int32_t)");
     STRUCT_SETUP(DB, get,            "int (*%s) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t)");
     STRUCT_SETUP(DB, key_range,      "int (*%s) (DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t)");
@@ -113,6 +115,8 @@ void sample_db_offsets (void) {
     STRUCT_SETUP(DB, remove,         "int (*%s) (DB *, const char *, const char *, u_int32_t)");
     STRUCT_SETUP(DB, rename,         "int (*%s) (DB *, const char *, const char *, const char *, u_int32_t)");
     STRUCT_SETUP(DB, set_bt_compare, "int (*%s) (DB *, int (*)(DB *, const DBT *, const DBT *))");
+    STRUCT_SETUP(DB, set_dup_compare, "int (*%s) (DB *, int (*)(DB *, const DBT *, const DBT *))");
+    STRUCT_SETUP(DB, set_pagesize,   "int (*%s) (DB *, u_int32_t)");
     STRUCT_SETUP(DB, set_flags,      "int (*%s) (DB *, u_int32_t)");
     STRUCT_SETUP(DB, stat,           "int (*%s) (DB *, void *, u_int32_t)");
     STRUCT_SETUP(DB, verify,         "int (*%s) (DB *, const char *, const char *, FILE *, u_int32_t)");
@@ -151,7 +155,7 @@ void sample_dbc_offsets (void) {
 
 void sample_dbt_offsets (void) {
     field_counter=0;
-#if DB_VERSION_MAJOR==4 && DB_VERSION_MINOR==1
+#if 0 && DB_VERSION_MAJOR==4 && DB_VERSION_MINOR==1
     STRUCT_SETUP(DBT, app_private, "void*%s");
 #endif
     STRUCT_SETUP(DBT, data,        "void*%s");

buildheader/sample_offsets_32_4_1.h

@@ -8,53 +8,57 @@ struct fieldinfo db_btree_stat_fields32[] = {
   {0, 80, 80} /* size of whole struct */
 };
 struct fieldinfo db_env_fields32[] = {
-  {"int  (*close) (DB_ENV *, u_int32_t)", 248, 4},
-  {"void (*err) (const DB_ENV *, int, const char *, ...)", 260, 4},
-  {"int  (*open) (DB_ENV *, const char *, u_int32_t, int)", 268, 4},
-  {"int  (*set_data_dir) (DB_ENV *, const char *)", 276, 4},
-  {"void (*set_errcall) (DB_ENV *, void (*)(const char *, char *))", 292, 4},
-  {"void (*set_errpfx) (DB_ENV *, const char *)", 300, 4},
-  {"int  (*set_flags) (DB_ENV *, u_int32_t, int)", 308, 4},
-  {"int  (*set_tmp_dir) (DB_ENV *, const char *)", 332, 4},
-  {"int  (*set_verbose) (DB_ENV *, u_int32_t, int)", 336, 4},
-  {"int  (*set_lg_bsize) (DB_ENV *, u_int32_t)", 344, 4},
-  {"int  (*set_lg_dir) (DB_ENV *, const char *)", 348, 4},
-  {"int  (*set_lg_max) (DB_ENV *, u_int32_t)", 352, 4},
-  {"int  (*log_archive) (DB_ENV *, char **[], u_int32_t)", 360, 4},
-  {"int  (*log_flush) (DB_ENV *, const DB_LSN *)", 372, 4},
-  {"int  (*set_lk_detect) (DB_ENV *, u_int32_t)", 392, 4},
-  {"int  (*set_lk_max) (DB_ENV *, u_int32_t)", 396, 4},
-  {"int  (*set_cachesize) (DB_ENV *, u_int32_t, u_int32_t, int)", 460, 4},
-  {"int  (*txn_begin) (DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t)", 548, 4},
-  {"int  (*txn_checkpoint) (DB_ENV *, u_int32_t, u_int32_t, u_int32_t)", 552, 4},
-  {"int  (*txn_stat) (DB_ENV *, DB_TXN_STAT **, u_int32_t)", 564, 4},
-  {0, 584, 584} /* size of whole struct */
+  {"void *app_private", 36, 4},
+  {"int  (*close) (DB_ENV *, u_int32_t)", 244, 4},
+  {"void (*err) (const DB_ENV *, int, const char *, ...)", 256, 4},
+  {"int  (*open) (DB_ENV *, const char *, u_int32_t, int)", 264, 4},
+  {"int  (*set_data_dir) (DB_ENV *, const char *)", 272, 4},
+  {"void (*set_errcall) (DB_ENV *, void (*)(const char *, char *))", 288, 4},
+  {"void (*set_errpfx) (DB_ENV *, const char *)", 296, 4},
+  {"int  (*set_flags) (DB_ENV *, u_int32_t, int)", 304, 4},
+  {"int  (*set_tmp_dir) (DB_ENV *, const char *)", 324, 4},
+  {"int  (*set_verbose) (DB_ENV *, u_int32_t, int)", 328, 4},
+  {"int  (*set_lg_bsize) (DB_ENV *, u_int32_t)", 336, 4},
+  {"int  (*set_lg_dir) (DB_ENV *, const char *)", 340, 4},
+  {"int  (*set_lg_max) (DB_ENV *, u_int32_t)", 344, 4},
+  {"int  (*log_archive) (DB_ENV *, char **[], u_int32_t)", 352, 4},
+  {"int  (*log_flush) (DB_ENV *, const DB_LSN *)", 364, 4},
+  {"int  (*set_lk_detect) (DB_ENV *, u_int32_t)", 384, 4},
+  {"int  (*set_lk_max) (DB_ENV *, u_int32_t)", 388, 4},
+  {"int  (*set_cachesize) (DB_ENV *, u_int32_t, u_int32_t, int)", 452, 4},
+  {"int  (*txn_begin) (DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t)", 540, 4},
+  {"int  (*txn_checkpoint) (DB_ENV *, u_int32_t, u_int32_t, u_int32_t)", 544, 4},
+  {"int  (*txn_stat) (DB_ENV *, DB_TXN_STAT **, u_int32_t)", 556, 4},
+  {0, 576, 576} /* size of whole struct */
 };
 struct fieldinfo db_key_range_fields32[] = {
   {"double less", 0, 8},
   {"double equal", 8, 8},
   {"double greater", 16, 8},
-  {0, 584, 584} /* size of whole struct */
+  {0, 576, 576} /* size of whole struct */
 };
 struct fieldinfo db_lsn_fields32[] = {
   {0, 8, 8} /* size of whole struct */
 };
 struct fieldinfo db_fields32[] = {
   {"void *app_private", 16, 4},
-  {"int (*close) (DB*, u_int32_t)", 272, 4},
-  {"int (*cursor) (DB *, DB_TXN *, DBC **, u_int32_t)", 276, 4},
-  {"int (*del) (DB *, DB_TXN *, DBT *, u_int32_t)", 280, 4},
-  {"int (*get) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t)", 296, 4},
-  {"int (*key_range) (DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t)", 316, 4},
-  {"int (*open) (DB *, DB_TXN *, const char *, const char *, DBTYPE, u_int32_t, int)", 320, 4},
-  {"int (*put) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t)", 324, 4},
-  {"int (*remove) (DB *, const char *, const char *, u_int32_t)", 328, 4},
-  {"int (*rename) (DB *, const char *, const char *, const char *, u_int32_t)", 332, 4},
-  {"int (*set_flags) (DB *, u_int32_t)", 380, 4},
-  {"int (*stat) (DB *, void *, u_int32_t)", 396, 4},
-  {"int (*verify) (DB *, const char *, const char *, FILE *, u_int32_t)", 408, 4},
-  {"int (*set_bt_compare) (DB *, int (*)(DB *, const DBT *, const DBT *))", 412, 4},
-  {0, 484, 484} /* size of whole struct */
+  {"DB_ENV *dbenv", 20, 4},
+  {"int (*close) (DB*, u_int32_t)", 260, 4},
+  {"int (*cursor) (DB *, DB_TXN *, DBC **, u_int32_t)", 264, 4},
+  {"int (*del) (DB *, DB_TXN *, DBT *, u_int32_t)", 268, 4},
+  {"int (*get) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t)", 284, 4},
+  {"int (*key_range) (DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t)", 304, 4},
+  {"int (*open) (DB *, DB_TXN *, const char *, const char *, DBTYPE, u_int32_t, int)", 308, 4},
+  {"int (*put) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t)", 312, 4},
+  {"int (*remove) (DB *, const char *, const char *, u_int32_t)", 316, 4},
+  {"int (*rename) (DB *, const char *, const char *, const char *, u_int32_t)", 320, 4},
+  {"int (*set_dup_compare) (DB *, int (*)(DB *, const DBT *, const DBT *))", 344, 4},
+  {"int (*set_flags) (DB *, u_int32_t)", 368, 4},
+  {"int (*set_pagesize) (DB *, u_int32_t)", 376, 4},
+  {"int (*stat) (DB *, void *, u_int32_t)", 384, 4},
+  {"int (*verify) (DB *, const char *, const char *, FILE *, u_int32_t)", 396, 4},
+  {"int (*set_bt_compare) (DB *, int (*)(DB *, const DBT *, const DBT *))", 400, 4},
+  {0, 472, 472} /* size of whole struct */
 };
 struct fieldinfo db_txn_active_fields32[] = {
   {"u_int32_t txnid", 0, 4},
@@ -73,16 +77,15 @@ struct fieldinfo db_txn_stat_fields32[] = {
   {0, 60, 60} /* size of whole struct */
 };
 struct fieldinfo dbc_fields32[] = {
-  {"int (*c_close) (DBC *)", 204, 4},
-  {"int (*c_del) (DBC *, u_int32_t)", 212, 4},
-  {"int (*c_get) (DBC *, DBT *, DBT *, u_int32_t)", 220, 4},
-  {0, 268, 268} /* size of whole struct */
+  {"int (*c_close) (DBC *)", 188, 4},
+  {"int (*c_del) (DBC *, u_int32_t)", 196, 4},
+  {"int (*c_get) (DBC *, DBT *, DBT *, u_int32_t)", 204, 4},
+  {0, 252, 252} /* size of whole struct */
 };
 struct fieldinfo dbt_fields32[] = {
   {"void*data", 0, 4},
   {"u_int32_t size", 4, 4},
   {"u_int32_t ulen", 8, 4},
-  {"void*app_private", 20, 4},
-  {"u_int32_t flags", 24, 4},
-  {0, 28, 28} /* size of whole struct */
+  {"u_int32_t flags", 20, 4},
+  {0, 24, 24} /* size of whole struct */
 };

buildheader/sample_offsets_32_4_3.h

@@ -8,6 +8,7 @@ struct fieldinfo db_btree_stat_fields32[] = {
   {0, 84, 84} /* size of whole struct */
 };
 struct fieldinfo db_env_fields32[] = {
+  {"void *app_private", 44, 4},
   {"int  (*close) (DB_ENV *, u_int32_t)", 276, 4},
   {"void (*err) (const DB_ENV *, int, const char *, ...)", 288, 4},
   {"int  (*open) (DB_ENV *, const char *, u_int32_t, int)", 296, 4},
@@ -41,6 +42,7 @@ struct fieldinfo db_lsn_fields32[] = {
 };
 struct fieldinfo db_fields32[] = {
   {"void *app_private", 16, 4},
+  {"DB_ENV *dbenv", 20, 4},
   {"int (*close) (DB*, u_int32_t)", 272, 4},
   {"int (*cursor) (DB *, DB_TXN *, DBC **, u_int32_t)", 276, 4},
   {"int (*del) (DB *, DB_TXN *, DBT *, u_int32_t)", 280, 4},
@@ -50,7 +52,9 @@ struct fieldinfo db_fields32[] = {
   {"int (*put) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t)", 372, 4},
   {"int (*remove) (DB *, const char *, const char *, u_int32_t)", 376, 4},
   {"int (*rename) (DB *, const char *, const char *, const char *, u_int32_t)", 380, 4},
+  {"int (*set_dup_compare) (DB *, int (*)(DB *, const DBT *, const DBT *))", 400, 4},
   {"int (*set_flags) (DB *, u_int32_t)", 424, 4},
+  {"int (*set_pagesize) (DB *, u_int32_t)", 444, 4},
   {"int (*stat) (DB *, void *, u_int32_t)", 452, 4},
   {"int (*verify) (DB *, const char *, const char *, FILE *, u_int32_t)", 468, 4},
   {"int (*set_bt_compare) (DB *, int (*)(DB *, const DBT *, const DBT *))", 476, 4},

buildheader/sample_offsets_64_4_1.h

@@ -8,53 +8,57 @@ struct fieldinfo db_btree_stat_fields64[] = {
   {0, 80, 80} /* size of whole struct */
 };
 struct fieldinfo db_env_fields64[] = {
-  {"int  (*close) (DB_ENV *, u_int32_t)", 432, 8},
-  {"void (*err) (const DB_ENV *, int, const char *, ...)", 456, 8},
-  {"int  (*open) (DB_ENV *, const char *, u_int32_t, int)", 472, 8},
-  {"int  (*set_data_dir) (DB_ENV *, const char *)", 488, 8},
-  {"void (*set_errcall) (DB_ENV *, void (*)(const char *, char *))", 520, 8},
-  {"void (*set_errpfx) (DB_ENV *, const char *)", 536, 8},
-  {"int  (*set_flags) (DB_ENV *, u_int32_t, int)", 552, 8},
-  {"int  (*set_tmp_dir) (DB_ENV *, const char *)", 600, 8},
-  {"int  (*set_verbose) (DB_ENV *, u_int32_t, int)", 608, 8},
-  {"int  (*set_lg_bsize) (DB_ENV *, u_int32_t)", 624, 8},
-  {"int  (*set_lg_dir) (DB_ENV *, const char *)", 632, 8},
-  {"int  (*set_lg_max) (DB_ENV *, u_int32_t)", 640, 8},
-  {"int  (*log_archive) (DB_ENV *, char **[], u_int32_t)", 656, 8},
-  {"int  (*log_flush) (DB_ENV *, const DB_LSN *)", 680, 8},
-  {"int  (*set_lk_detect) (DB_ENV *, u_int32_t)", 720, 8},
-  {"int  (*set_lk_max) (DB_ENV *, u_int32_t)", 728, 8},
-  {"int  (*set_cachesize) (DB_ENV *, u_int32_t, u_int32_t, int)", 856, 8},
-  {"int  (*txn_begin) (DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t)", 1032, 8},
-  {"int  (*txn_checkpoint) (DB_ENV *, u_int32_t, u_int32_t, u_int32_t)", 1040, 8},
-  {"int  (*txn_stat) (DB_ENV *, DB_TXN_STAT **, u_int32_t)", 1064, 8},
-  {0, 1096, 1096} /* size of whole struct */
+  {"void *app_private", 72, 8},
+  {"int  (*close) (DB_ENV *, u_int32_t)", 424, 8},
+  {"void (*err) (const DB_ENV *, int, const char *, ...)", 448, 8},
+  {"int  (*open) (DB_ENV *, const char *, u_int32_t, int)", 464, 8},
+  {"int  (*set_data_dir) (DB_ENV *, const char *)", 480, 8},
+  {"void (*set_errcall) (DB_ENV *, void (*)(const char *, char *))", 512, 8},
+  {"void (*set_errpfx) (DB_ENV *, const char *)", 528, 8},
+  {"int  (*set_flags) (DB_ENV *, u_int32_t, int)", 544, 8},
+  {"int  (*set_tmp_dir) (DB_ENV *, const char *)", 584, 8},
+  {"int  (*set_verbose) (DB_ENV *, u_int32_t, int)", 592, 8},
+  {"int  (*set_lg_bsize) (DB_ENV *, u_int32_t)", 608, 8},
+  {"int  (*set_lg_dir) (DB_ENV *, const char *)", 616, 8},
+  {"int  (*set_lg_max) (DB_ENV *, u_int32_t)", 624, 8},
+  {"int  (*log_archive) (DB_ENV *, char **[], u_int32_t)", 640, 8},
+  {"int  (*log_flush) (DB_ENV *, const DB_LSN *)", 664, 8},
+  {"int  (*set_lk_detect) (DB_ENV *, u_int32_t)", 704, 8},
+  {"int  (*set_lk_max) (DB_ENV *, u_int32_t)", 712, 8},
+  {"int  (*set_cachesize) (DB_ENV *, u_int32_t, u_int32_t, int)", 840, 8},
+  {"int  (*txn_begin) (DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t)", 1016, 8},
+  {"int  (*txn_checkpoint) (DB_ENV *, u_int32_t, u_int32_t, u_int32_t)", 1024, 8},
+  {"int  (*txn_stat) (DB_ENV *, DB_TXN_STAT **, u_int32_t)", 1048, 8},
+  {0, 1080, 1080} /* size of whole struct */
 };
 struct fieldinfo db_key_range_fields64[] = {
   {"double less", 0, 8},
   {"double equal", 8, 8},
   {"double greater", 16, 8},
-  {0, 1096, 1096} /* size of whole struct */
+  {0, 1080, 1080} /* size of whole struct */
 };
 struct fieldinfo db_lsn_fields64[] = {
   {0, 8, 8} /* size of whole struct */
 };
 struct fieldinfo db_fields64[] = {
   {"void *app_private", 32, 8},
-  {"int (*close) (DB*, u_int32_t)", 448, 8},
-  {"int (*cursor) (DB *, DB_TXN *, DBC **, u_int32_t)", 456, 8},
-  {"int (*del) (DB *, DB_TXN *, DBT *, u_int32_t)", 464, 8},
-  {"int (*get) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t)", 496, 8},
-  {"int (*key_range) (DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t)", 536, 8},
-  {"int (*open) (DB *, DB_TXN *, const char *, const char *, DBTYPE, u_int32_t, int)", 544, 8},
-  {"int (*put) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t)", 552, 8},
-  {"int (*remove) (DB *, const char *, const char *, u_int32_t)", 560, 8},
-  {"int (*rename) (DB *, const char *, const char *, const char *, u_int32_t)", 568, 8},
-  {"int (*set_flags) (DB *, u_int32_t)", 664, 8},
-  {"int (*stat) (DB *, void *, u_int32_t)", 696, 8},
-  {"int (*verify) (DB *, const char *, const char *, FILE *, u_int32_t)", 720, 8},
-  {"int (*set_bt_compare) (DB *, int (*)(DB *, const DBT *, const DBT *))", 728, 8},
-  {0, 864, 864} /* size of whole struct */
+  {"DB_ENV *dbenv", 40, 8},
+  {"int (*close) (DB*, u_int32_t)", 424, 8},
+  {"int (*cursor) (DB *, DB_TXN *, DBC **, u_int32_t)", 432, 8},
+  {"int (*del) (DB *, DB_TXN *, DBT *, u_int32_t)", 440, 8},
+  {"int (*get) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t)", 472, 8},
+  {"int (*key_range) (DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t)", 512, 8},
+  {"int (*open) (DB *, DB_TXN *, const char *, const char *, DBTYPE, u_int32_t, int)", 520, 8},
+  {"int (*put) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t)", 528, 8},
+  {"int (*remove) (DB *, const char *, const char *, u_int32_t)", 536, 8},
+  {"int (*rename) (DB *, const char *, const char *, const char *, u_int32_t)", 544, 8},
+  {"int (*set_dup_compare) (DB *, int (*)(DB *, const DBT *, const DBT *))", 592, 8},
+  {"int (*set_flags) (DB *, u_int32_t)", 640, 8},
+  {"int (*set_pagesize) (DB *, u_int32_t)", 656, 8},
+  {"int (*stat) (DB *, void *, u_int32_t)", 672, 8},
+  {"int (*verify) (DB *, const char *, const char *, FILE *, u_int32_t)", 696, 8},
+  {"int (*set_bt_compare) (DB *, int (*)(DB *, const DBT *, const DBT *))", 704, 8},
+  {0, 840, 840} /* size of whole struct */
 };
 struct fieldinfo db_txn_active_fields64[] = {
   {"u_int32_t txnid", 0, 4},
@@ -73,16 +77,15 @@ struct fieldinfo db_txn_stat_fields64[] = {
   {0, 72, 72} /* size of whole struct */
 };
 struct fieldinfo dbc_fields64[] = {
-  {"int (*c_close) (DBC *)", 304, 8},
-  {"int (*c_del) (DBC *, u_int32_t)", 320, 8},
-  {"int (*c_get) (DBC *, DBT *, DBT *, u_int32_t)", 336, 8},
-  {0, 432, 432} /* size of whole struct */
+  {"int (*c_close) (DBC *)", 272, 8},
+  {"int (*c_del) (DBC *, u_int32_t)", 288, 8},
+  {"int (*c_get) (DBC *, DBT *, DBT *, u_int32_t)", 304, 8},
+  {0, 400, 400} /* size of whole struct */
 };
 struct fieldinfo dbt_fields64[] = {
   {"void*data", 0, 8},
   {"u_int32_t size", 8, 4},
   {"u_int32_t ulen", 12, 4},
-  {"void*app_private", 24, 8},
-  {"u_int32_t flags", 32, 4},
-  {0, 40, 40} /* size of whole struct */
+  {"u_int32_t flags", 24, 4},
+  {0, 32, 32} /* size of whole struct */
 };

buildheader/sample_offsets_64_4_3.h

@@ -8,6 +8,7 @@ struct fieldinfo db_btree_stat_fields64[] = {
   {0, 84, 84} /* size of whole struct */
 };
 struct fieldinfo db_env_fields64[] = {
+  {"void *app_private", 88, 8},
   {"int  (*close) (DB_ENV *, u_int32_t)", 456, 8},
   {"void (*err) (const DB_ENV *, int, const char *, ...)", 480, 8},
   {"int  (*open) (DB_ENV *, const char *, u_int32_t, int)", 496, 8},
@@ -41,6 +42,7 @@ struct fieldinfo db_lsn_fields64[] = {
 };
 struct fieldinfo db_fields64[] = {
   {"void *app_private", 32, 8},
+  {"DB_ENV *dbenv", 40, 8},
   {"int (*close) (DB*, u_int32_t)", 448, 8},
   {"int (*cursor) (DB *, DB_TXN *, DBC **, u_int32_t)", 456, 8},
   {"int (*del) (DB *, DB_TXN *, DBT *, u_int32_t)", 464, 8},
@@ -50,7 +52,9 @@ struct fieldinfo db_fields64[] = {
   {"int (*put) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t)", 648, 8},
   {"int (*remove) (DB *, const char *, const char *, u_int32_t)", 656, 8},
   {"int (*rename) (DB *, const char *, const char *, const char *, u_int32_t)", 664, 8},
+  {"int (*set_dup_compare) (DB *, int (*)(DB *, const DBT *, const DBT *))", 704, 8},
   {"int (*set_flags) (DB *, u_int32_t)", 752, 8},
+  {"int (*set_pagesize) (DB *, u_int32_t)", 792, 8},
   {"int (*stat) (DB *, void *, u_int32_t)", 808, 8},
   {"int (*verify) (DB *, const char *, const char *, FILE *, u_int32_t)", 840, 8},
   {"int (*set_bt_compare) (DB *, int (*)(DB *, const DBT *, const DBT *))", 856, 8},