From 8f6e9960709e94a986e088d90a25b24491c6bc1c Mon Sep 17 00:00:00 2001 From: Rich Prohaska Date: Wed, 26 Dec 2007 13:49:47 +0000 Subject: [PATCH] build with bdb 4.6 git-svn-id: file:///svn/tokudb@1363 c7de825b-a66e-492c-adef-691d508d4ae1 --- buildheader/db.h_4_6 | 6 ++++-- buildheader/sample_offsets_64_4_6.h | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/buildheader/db.h_4_6 b/buildheader/db.h_4_6 index 7d103dda944..f6daece7b5f 100644 --- a/buildheader/db.h_4_6 +++ b/buildheader/db.h_4_6 @@ -213,8 +213,9 @@ struct __toku_db_txn_active { char __toku_dummy2[200]; /* Padding at the end */ }; struct __toku_db_txn { + DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/; /* 32-bit offset=0 size=4, 64=bit offset=0 size=8 */ struct __toku_db_txn_internal *i; - void* __toku_dummy0[19]; + void* __toku_dummy0[18]; char __toku_dummy1[8]; void *api_internal; /* 32-bit offset=88 size=4, 64=bit offset=168 size=8 */ void* __toku_dummy2[2]; @@ -235,8 +236,9 @@ struct __toku_db_txn_stat { char __toku_dummy5[8]; /* Padding at the end */ }; struct __toku_dbc { + DB *dbp; /* 32-bit offset=0 size=4, 64=bit offset=0 size=8 */ struct __toku_dbc_internal *i; - void* __toku_dummy0[34]; + void* __toku_dummy0[33]; char __toku_dummy1[104]; int (*c_close) (DBC *); /* 32-bit offset=244 size=4, 64=bit offset=384 size=8 */ void* __toku_dummy2[1]; diff --git a/buildheader/sample_offsets_64_4_6.h b/buildheader/sample_offsets_64_4_6.h index 1943836694e..95c7fd3d47e 100644 --- a/buildheader/sample_offsets_64_4_6.h +++ b/buildheader/sample_offsets_64_4_6.h @@ -75,6 +75,7 @@ struct fieldinfo db_txn_active_fields64[] = { {0, 232, 232} /* size of whole struct */ }; struct fieldinfo db_txn_fields64[] = { + {"DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/", 0, 8}, {"void *api_internal", 168, 8}, {"int (*abort) (DB_TXN *)", 192, 8}, {"int (*commit) (DB_TXN*, u_int32_t)", 200, 8}, @@ -87,6 +88,7 @@ struct fieldinfo db_txn_stat_fields64[] = { {0, 88, 88} /* size of whole struct */ }; struct fieldinfo dbc_fields64[] = { + {"DB *dbp", 0, 8}, {"int (*c_close) (DBC *)", 384, 8}, {"int (*c_del) (DBC *, u_int32_t)", 400, 8}, {"int (*c_get) (DBC *, DBT *, DBT *, u_int32_t)", 416, 8},