diff --git a/buildheader/db.h_4_1 b/buildheader/db.h_4_1 index 19de1cc9b6c..21d37492147 100644 --- a/buildheader/db.h_4_1 +++ b/buildheader/db.h_4_1 @@ -219,8 +219,9 @@ struct __toku_db_txn_active { }; 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 */ + DB_TXN *parent; /* 32-bit offset=4 size=4, 64=bit offset=8 size=8 */ struct __toku_db_txn_internal *i; - void* __toku_dummy0[9]; + void* __toku_dummy0[8]; char __toku_dummy1[24]; void *api_internal; /* 32-bit offset=68 size=4, 64=bit offset=112 size=8 */ void* __toku_dummy2[1]; diff --git a/buildheader/db.h_4_3 b/buildheader/db.h_4_3 index 5fb3822264a..abccd79b6c9 100644 --- a/buildheader/db.h_4_3 +++ b/buildheader/db.h_4_3 @@ -235,8 +235,9 @@ struct __toku_db_txn_active { }; 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 */ + DB_TXN *parent; /* 32-bit offset=4 size=4, 64=bit offset=8 size=8 */ struct __toku_db_txn_internal *i; - void* __toku_dummy0[14]; + void* __toku_dummy0[13]; char __toku_dummy1[24]; void *api_internal; /* 32-bit offset=88 size=4, 64=bit offset=152 size=8 */ void* __toku_dummy2[2]; diff --git a/buildheader/db.h_4_4 b/buildheader/db.h_4_4 index 42798ed7402..941913ee01c 100644 --- a/buildheader/db.h_4_4 +++ b/buildheader/db.h_4_4 @@ -240,8 +240,9 @@ struct __toku_db_txn_active { }; 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 */ + DB_TXN *parent; /* 32-bit offset=4 size=4, 64=bit offset=8 size=8 */ struct __toku_db_txn_internal *i; - void* __toku_dummy0[17]; + void* __toku_dummy0[16]; char __toku_dummy1[8]; void *api_internal; /* 32-bit offset=84 size=4, 64=bit offset=160 size=8 */ void* __toku_dummy2[2]; diff --git a/buildheader/db.h_4_5 b/buildheader/db.h_4_5 index ae3ebd05fc1..6ba875231fb 100644 --- a/buildheader/db.h_4_5 +++ b/buildheader/db.h_4_5 @@ -239,8 +239,9 @@ struct __toku_db_txn_active { }; 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 */ + DB_TXN *parent; /* 32-bit offset=4 size=4, 64=bit offset=8 size=8 */ struct __toku_db_txn_internal *i; - void* __toku_dummy0[17]; + void* __toku_dummy0[16]; char __toku_dummy1[8]; void *api_internal; /* 32-bit offset=84 size=4, 64=bit offset=160 size=8 */ void* __toku_dummy2[2]; diff --git a/buildheader/db.h_4_6 b/buildheader/db.h_4_6 index 407625c5454..8d72002249a 100644 --- a/buildheader/db.h_4_6 +++ b/buildheader/db.h_4_6 @@ -243,8 +243,9 @@ struct __toku_db_txn_active { }; 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 */ + DB_TXN *parent; /* 32-bit offset=4 size=4, 64=bit offset=8 size=8 */ struct __toku_db_txn_internal *i; - void* __toku_dummy0[18]; + void* __toku_dummy0[17]; char __toku_dummy1[8]; void *api_internal; /* 32-bit offset=88 size=4, 64=bit offset=168 size=8 */ void* __toku_dummy2[2]; diff --git a/buildheader/sample_offsets_64_4_1.h b/buildheader/sample_offsets_64_4_1.h index 585785c46ac..019edfd2154 100644 --- a/buildheader/sample_offsets_64_4_1.h +++ b/buildheader/sample_offsets_64_4_1.h @@ -76,6 +76,7 @@ struct fieldinfo db_txn_active_fields64[] = { }; struct fieldinfo db_txn_fields64[] = { {"DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/", 0, 8}, + {"DB_TXN *parent", 8, 8}, {"void *api_internal", 112, 8}, {"int (*abort) (DB_TXN *)", 128, 8}, {"int (*commit) (DB_TXN*, u_int32_t)", 136, 8}, diff --git a/buildheader/sample_offsets_64_4_3.h b/buildheader/sample_offsets_64_4_3.h index e0145048c17..b09792c6063 100644 --- a/buildheader/sample_offsets_64_4_3.h +++ b/buildheader/sample_offsets_64_4_3.h @@ -82,6 +82,7 @@ struct fieldinfo db_txn_active_fields64[] = { }; struct fieldinfo db_txn_fields64[] = { {"DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/", 0, 8}, + {"DB_TXN *parent", 8, 8}, {"void *api_internal", 152, 8}, {"int (*abort) (DB_TXN *)", 176, 8}, {"int (*commit) (DB_TXN*, u_int32_t)", 184, 8}, diff --git a/buildheader/sample_offsets_64_4_4.h b/buildheader/sample_offsets_64_4_4.h index 19de154d154..1eb5236f4f1 100644 --- a/buildheader/sample_offsets_64_4_4.h +++ b/buildheader/sample_offsets_64_4_4.h @@ -82,6 +82,7 @@ struct fieldinfo db_txn_active_fields64[] = { }; struct fieldinfo db_txn_fields64[] = { {"DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/", 0, 8}, + {"DB_TXN *parent", 8, 8}, {"void *api_internal", 160, 8}, {"int (*abort) (DB_TXN *)", 184, 8}, {"int (*commit) (DB_TXN*, u_int32_t)", 192, 8}, diff --git a/buildheader/sample_offsets_64_4_5.h b/buildheader/sample_offsets_64_4_5.h index 4a30a1bf1a6..c757c4bb236 100644 --- a/buildheader/sample_offsets_64_4_5.h +++ b/buildheader/sample_offsets_64_4_5.h @@ -81,6 +81,7 @@ struct fieldinfo db_txn_active_fields64[] = { }; struct fieldinfo db_txn_fields64[] = { {"DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/", 0, 8}, + {"DB_TXN *parent", 8, 8}, {"void *api_internal", 160, 8}, {"int (*abort) (DB_TXN *)", 184, 8}, {"int (*commit) (DB_TXN*, u_int32_t)", 192, 8}, diff --git a/buildheader/sample_offsets_64_4_6.h b/buildheader/sample_offsets_64_4_6.h index aa781c23197..99de9241ea9 100644 --- a/buildheader/sample_offsets_64_4_6.h +++ b/buildheader/sample_offsets_64_4_6.h @@ -81,6 +81,7 @@ struct fieldinfo db_txn_active_fields64[] = { }; struct fieldinfo db_txn_fields64[] = { {"DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/", 0, 8}, + {"DB_TXN *parent", 8, 8}, {"void *api_internal", 168, 8}, {"int (*abort) (DB_TXN *)", 192, 8}, {"int (*commit) (DB_TXN*, u_int32_t)", 200, 8}, diff --git a/include/db.h b/include/db.h index 42798ed7402..941913ee01c 100644 --- a/include/db.h +++ b/include/db.h @@ -240,8 +240,9 @@ struct __toku_db_txn_active { }; 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 */ + DB_TXN *parent; /* 32-bit offset=4 size=4, 64=bit offset=8 size=8 */ struct __toku_db_txn_internal *i; - void* __toku_dummy0[17]; + void* __toku_dummy0[16]; char __toku_dummy1[8]; void *api_internal; /* 32-bit offset=84 size=4, 64=bit offset=160 size=8 */ void* __toku_dummy2[2];