build on debian432.tokutek.com addresses #133

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

buildheader/db.h_4_1

@@ -102,18 +102,20 @@ struct __toku_db_env {
   struct __toku_db_env_internal *i;
   void* __toku_dummy0[8];
   void *app_private; /* 32-bit offset=36 size=4, 64=bit offset=72 size=8 */
-  void* __toku_dummy1[35];
+  void* __toku_dummy1[27];
   char __toku_dummy2[64];
+  void *api1_internal; /* 32-bit offset=212 size=4, 64=bit offset=360 size=8 */
+  void* __toku_dummy3[7];
   int  (*close) (DB_ENV *, u_int32_t); /* 32-bit offset=244 size=4, 64=bit offset=424 size=8 */
-  void* __toku_dummy3[2];
+  void* __toku_dummy4[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  (*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  (*open) (DB_ENV *, const char *, u_int32_t, int); /* 32-bit offset=264 size=4, 64=bit offset=464 size=8 */
+  void* __toku_dummy6[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* __toku_dummy7[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];
+  void (*set_errfile) (DB_ENV *, FILE*); /* 32-bit offset=292 size=4, 64=bit offset=520 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 */
@@ -175,17 +177,19 @@ struct __toku_db {
   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_dummy6[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_dummy7[5];
+  void* __toku_dummy7[2];
+  void (*set_errfile) (DB *, FILE*); /* 32-bit offset=356 size=4, 64=bit offset=616 size=8 */
+  void* __toku_dummy8[2];
   int (*set_flags) (DB *, u_int32_t); /* 32-bit offset=368 size=4, 64=bit offset=640 size=8 */
-  void* __toku_dummy8[1];
-  int (*set_pagesize) (DB *, u_int32_t); /* 32-bit offset=376 size=4, 64=bit offset=656 size=8 */
   void* __toku_dummy9[1];
+  int (*set_pagesize) (DB *, u_int32_t); /* 32-bit offset=376 size=4, 64=bit offset=656 size=8 */
+  void* __toku_dummy10[1];
   int (*stat) (DB *, void *, u_int32_t); /* 32-bit offset=384 size=4, 64=bit offset=672 size=8 */
-  void* __toku_dummy10[2];
+  void* __toku_dummy11[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_dummy11[15]; /* Padding at the end */ 
-  char __toku_dummy12[8];  /* Padding at the end */ 
+  void* __toku_dummy12[15]; /* Padding at the end */ 
+  char __toku_dummy13[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 */
@@ -194,13 +198,15 @@ struct __toku_db_txn_active {
 };
 struct __toku_db_txn {
   struct __toku_db_txn_internal *i;
-  void* __toku_dummy0[12];
+  void* __toku_dummy0[10];
   char __toku_dummy1[24];
+  void *api_internal; /* 32-bit offset=68 size=4, 64=bit offset=112 size=8 */
+  void* __toku_dummy2[1];
   int (*abort) (DB_TXN *); /* 32-bit offset=76 size=4, 64=bit offset=128 size=8 */
   int (*commit) (DB_TXN*, u_int32_t); /* 32-bit offset=80 size=4, 64=bit offset=136 size=8 */
-  void* __toku_dummy2[1];
+  void* __toku_dummy3[1];
   u_int32_t (*id) (DB_TXN *); /* 32-bit offset=88 size=4, 64=bit offset=152 size=8 */
-  void* __toku_dummy3[3]; /* Padding at the end */ 
+  void* __toku_dummy4[3]; /* Padding at the end */ 
 };
 struct __toku_db_txn_stat {
   void* __toku_dummy0[1];

buildheader/db.h_4_5

@@ -125,28 +125,28 @@ struct __toku_db_env {
   int  (*set_data_dir) (DB_ENV *, const char *); /* 32-bit offset=780 size=4, 64=bit offset=1432 size=8 */
   void* __toku_dummy11[1];
   void (*set_errcall) (DB_ENV *, void (*)(const char *, char *)); /* 32-bit offset=788 size=4, 64=bit offset=1448 size=8 */
-  void* __toku_dummy12[1];
+  void (*set_errfile) (DB_ENV *, FILE*); /* 32-bit offset=792 size=4, 64=bit offset=1456 size=8 */
   void (*set_errpfx) (DB_ENV *, const char *); /* 32-bit offset=796 size=4, 64=bit offset=1464 size=8 */
-  void* __toku_dummy13[2];
+  void* __toku_dummy12[2];
   int  (*set_flags) (DB_ENV *, u_int32_t, int); /* 32-bit offset=808 size=4, 64=bit offset=1488 size=8 */
-  void* __toku_dummy14[2];
+  void* __toku_dummy13[2];
   int  (*set_lg_bsize) (DB_ENV *, u_int32_t); /* 32-bit offset=820 size=4, 64=bit offset=1512 size=8 */
   int  (*set_lg_dir) (DB_ENV *, const char *); /* 32-bit offset=824 size=4, 64=bit offset=1520 size=8 */
-  void* __toku_dummy15[1];
+  void* __toku_dummy14[1];
   int  (*set_lg_max) (DB_ENV *, u_int32_t); /* 32-bit offset=832 size=4, 64=bit offset=1536 size=8 */
-  void* __toku_dummy16[2];
+  void* __toku_dummy15[2];
   int  (*set_lk_detect) (DB_ENV *, u_int32_t); /* 32-bit offset=844 size=4, 64=bit offset=1560 size=8 */
-  void* __toku_dummy17[16];
+  void* __toku_dummy16[16];
   int  (*set_tmp_dir) (DB_ENV *, const char *); /* 32-bit offset=912 size=4, 64=bit offset=1696 size=8 */
-  void* __toku_dummy18[2];
+  void* __toku_dummy17[2];
   int  (*set_verbose) (DB_ENV *, u_int32_t, int); /* 32-bit offset=924 size=4, 64=bit offset=1720 size=8 */
-  void* __toku_dummy19[1];
+  void* __toku_dummy18[1];
   int  (*txn_begin) (DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t); /* 32-bit offset=932 size=4, 64=bit offset=1736 size=8 */
   int  (*txn_checkpoint) (DB_ENV *, u_int32_t, u_int32_t, u_int32_t); /* 32-bit offset=936 size=4, 64=bit offset=1744 size=8 */
-  void* __toku_dummy20[1];
+  void* __toku_dummy19[1];
   int  (*txn_stat) (DB_ENV *, DB_TXN_STAT **, u_int32_t); /* 32-bit offset=944 size=4, 64=bit offset=1760 size=8 */
-  void* __toku_dummy21[2]; /* Padding at the end */ 
-  char __toku_dummy22[16];  /* Padding at the end */ 
+  void* __toku_dummy20[2]; /* Padding at the end */ 
+  char __toku_dummy21[16];  /* Padding at the end */ 
 };
 struct __toku_db_key_range {
   double less; /* 32-bit offset=0 size=8, 64=bit offset=0 size=8 */
@@ -189,16 +189,18 @@ struct __toku_db {
   int (*set_bt_compare) (DB *, int (*)(DB *, const DBT *, const DBT *)); /* 32-bit offset=452 size=4, 64=bit offset=808 size=8 */
   void* __toku_dummy10[3];
   int (*set_dup_compare) (DB *, int (*)(DB *, const DBT *, const DBT *)); /* 32-bit offset=468 size=4, 64=bit offset=840 size=8 */
-  void* __toku_dummy11[5];
+  void* __toku_dummy11[2];
+  void (*set_errfile) (DB *, FILE*); /* 32-bit offset=480 size=4, 64=bit offset=864 size=8 */
+  void* __toku_dummy12[2];
   int (*set_flags) (DB *, u_int32_t); /* 32-bit offset=492 size=4, 64=bit offset=888 size=8 */
-  void* __toku_dummy12[6];
-  int (*set_pagesize) (DB *, u_int32_t); /* 32-bit offset=520 size=4, 64=bit offset=944 size=8 */
   void* __toku_dummy13[6];
+  int (*set_pagesize) (DB *, u_int32_t); /* 32-bit offset=520 size=4, 64=bit offset=944 size=8 */
+  void* __toku_dummy14[6];
   int (*stat) (DB *, void *, u_int32_t); /* 32-bit offset=548 size=4, 64=bit offset=1000 size=8 */
-  void* __toku_dummy14[4];
+  void* __toku_dummy15[4];
   int (*verify) (DB *, const char *, const char *, FILE *, u_int32_t); /* 32-bit offset=568 size=4, 64=bit offset=1040 size=8 */
-  void* __toku_dummy15[5]; /* Padding at the end */ 
-  char __toku_dummy16[16];  /* Padding at the end */ 
+  void* __toku_dummy16[5]; /* Padding at the end */ 
+  char __toku_dummy17[16];  /* 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/db.h_4_6

@@ -104,28 +104,30 @@ struct __toku_db_env {
   struct __toku_db_env_internal *i;
   void* __toku_dummy0[12];
   void *app_private; /* 32-bit offset=52 size=4, 64=bit offset=104 size=8 */
-  void* __toku_dummy1[48];
+  void* __toku_dummy1[39];
   char __toku_dummy2[144];
+  void *api1_internal; /* 32-bit offset=356 size=4, 64=bit offset=568 size=8 */
+  void* __toku_dummy3[8];
   int  (*close) (DB_ENV *, u_int32_t); /* 32-bit offset=392 size=4, 64=bit offset=640 size=8 */
-  void* __toku_dummy3[2];
+  void* __toku_dummy4[2];
   void (*err) (const DB_ENV *, int, const char *, ...); /* 32-bit offset=404 size=4, 64=bit offset=664 size=8 */
-  void* __toku_dummy4[3];
+  void* __toku_dummy5[3];
   int (*get_cachesize) (DB_ENV *, u_int32_t *); /* 32-bit offset=420 size=4, 64=bit offset=696 size=8 */
-  void* __toku_dummy5[5];
+  void* __toku_dummy6[5];
   int (*get_flags) (DB_ENV *, u_int32_t *); /* 32-bit offset=444 size=4, 64=bit offset=744 size=8 */
-  void* __toku_dummy6[32];
+  void* __toku_dummy7[32];
   int  (*log_archive) (DB_ENV *, char **[], u_int32_t); /* 32-bit offset=576 size=4, 64=bit offset=1008 size=8 */
-  void* __toku_dummy7[2];
+  void* __toku_dummy8[2];
   int  (*log_flush) (DB_ENV *, const DB_LSN *); /* 32-bit offset=588 size=4, 64=bit offset=1032 size=8 */
-  void* __toku_dummy8[25];
+  void* __toku_dummy9[25];
   int  (*open) (DB_ENV *, const char *, u_int32_t, int); /* 32-bit offset=692 size=4, 64=bit offset=1240 size=8 */
-  void* __toku_dummy9[30];
+  void* __toku_dummy10[30];
   int  (*set_cachesize) (DB_ENV *, u_int32_t, u_int32_t, int); /* 32-bit offset=816 size=4, 64=bit offset=1488 size=8 */
-  void* __toku_dummy10[1];
-  int  (*set_data_dir) (DB_ENV *, const char *); /* 32-bit offset=824 size=4, 64=bit offset=1504 size=8 */
   void* __toku_dummy11[1];
-  void (*set_errcall) (DB_ENV *, void (*)(const char *, char *)); /* 32-bit offset=832 size=4, 64=bit offset=1520 size=8 */
+  int  (*set_data_dir) (DB_ENV *, const char *); /* 32-bit offset=824 size=4, 64=bit offset=1504 size=8 */
   void* __toku_dummy12[1];
+  void (*set_errcall) (DB_ENV *, void (*)(const char *, char *)); /* 32-bit offset=832 size=4, 64=bit offset=1520 size=8 */
+  void (*set_errfile) (DB_ENV *, FILE*); /* 32-bit offset=836 size=4, 64=bit offset=1528 size=8 */
   void (*set_errpfx) (DB_ENV *, const char *); /* 32-bit offset=840 size=4, 64=bit offset=1536 size=8 */
   void* __toku_dummy13[2];
   int  (*set_flags) (DB_ENV *, u_int32_t, int); /* 32-bit offset=852 size=4, 64=bit offset=1560 size=8 */
@@ -190,16 +192,18 @@ struct __toku_db {
   int (*set_bt_compare) (DB *, int (*)(DB *, const DBT *, const DBT *)); /* 32-bit offset=472 size=4, 64=bit offset=856 size=8 */
   void* __toku_dummy11[3];
   int (*set_dup_compare) (DB *, int (*)(DB *, const DBT *, const DBT *)); /* 32-bit offset=488 size=4, 64=bit offset=888 size=8 */
-  void* __toku_dummy12[5];
+  void* __toku_dummy12[2];
+  void (*set_errfile) (DB *, FILE*); /* 32-bit offset=500 size=4, 64=bit offset=912 size=8 */
+  void* __toku_dummy13[2];
   int (*set_flags) (DB *, u_int32_t); /* 32-bit offset=512 size=4, 64=bit offset=936 size=8 */
-  void* __toku_dummy13[7];
-  int (*set_pagesize) (DB *, u_int32_t); /* 32-bit offset=544 size=4, 64=bit offset=1000 size=8 */
   void* __toku_dummy14[7];
+  int (*set_pagesize) (DB *, u_int32_t); /* 32-bit offset=544 size=4, 64=bit offset=1000 size=8 */
+  void* __toku_dummy15[7];
   int (*stat) (DB *, void *, u_int32_t); /* 32-bit offset=576 size=4, 64=bit offset=1064 size=8 */
-  void* __toku_dummy15[4];
+  void* __toku_dummy16[4];
   int (*verify) (DB *, const char *, const char *, FILE *, u_int32_t); /* 32-bit offset=596 size=4, 64=bit offset=1104 size=8 */
-  void* __toku_dummy16[5]; /* Padding at the end */ 
-  char __toku_dummy17[16];  /* Padding at the end */ 
+  void* __toku_dummy17[5]; /* Padding at the end */ 
+  char __toku_dummy18[16];  /* 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 */
@@ -210,13 +214,15 @@ struct __toku_db_txn_active {
 };
 struct __toku_db_txn {
   struct __toku_db_txn_internal *i;
-  void* __toku_dummy0[22];
+  void* __toku_dummy0[19];
   char __toku_dummy1[8];
+  void *api_internal; /* 32-bit offset=88 size=4, 64=bit offset=168 size=8 */
+  void* __toku_dummy2[2];
   int (*abort) (DB_TXN *); /* 32-bit offset=100 size=4, 64=bit offset=192 size=8 */
   int (*commit) (DB_TXN*, u_int32_t); /* 32-bit offset=104 size=4, 64=bit offset=200 size=8 */
-  void* __toku_dummy2[2];
+  void* __toku_dummy3[2];
   u_int32_t (*id) (DB_TXN *); /* 32-bit offset=116 size=4, 64=bit offset=224 size=8 */
-  void* __toku_dummy3[5]; /* Padding at the end */ 
+  void* __toku_dummy4[5]; /* Padding at the end */ 
 };
 struct __toku_db_txn_stat {
   void* __toku_dummy0[2];

buildheader/sample_offsets_64_4_1.h

@@ -9,11 +9,13 @@ struct fieldinfo db_btree_stat_fields64[] = {
 };
 struct fieldinfo db_env_fields64[] = {
   {"void *app_private", 72, 8},
+  {"void *api1_internal", 360, 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_errfile) (DB_ENV *, FILE*)", 520, 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},
@@ -56,6 +58,7 @@ struct fieldinfo db_fields64[] = {
   {"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},
+  {"void (*set_errfile) (DB *, FILE*)", 616, 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},
@@ -69,6 +72,7 @@ struct fieldinfo db_txn_active_fields64[] = {
   {0, 16, 16} /* size of whole struct */
 };
 struct fieldinfo db_txn_fields64[] = {
+  {"void *api_internal", 112, 8},
   {"int (*abort) (DB_TXN *)", 128, 8},
   {"int (*commit) (DB_TXN*, u_int32_t)", 136, 8},
   {"u_int32_t (*id) (DB_TXN *)", 152, 8},

buildheader/sample_offsets_64_4_6.h

@@ -9,6 +9,7 @@ struct fieldinfo db_btree_stat_fields64[] = {
 };
 struct fieldinfo db_env_fields64[] = {
   {"void *app_private", 104, 8},
+  {"void *api1_internal", 568, 8},
   {"int  (*close) (DB_ENV *, u_int32_t)", 640, 8},
   {"void (*err) (const DB_ENV *, int, const char *, ...)", 664, 8},
   {"int (*get_cachesize) (DB_ENV *, u_int32_t *)", 696, 8},
@@ -19,6 +20,7 @@ struct fieldinfo db_env_fields64[] = {
   {"int  (*set_cachesize) (DB_ENV *, u_int32_t, u_int32_t, int)", 1488, 8},
   {"int  (*set_data_dir) (DB_ENV *, const char *)", 1504, 8},
   {"void (*set_errcall) (DB_ENV *, void (*)(const char *, char *))", 1520, 8},
+  {"void (*set_errfile) (DB_ENV *, FILE*)", 1528, 8},
   {"void (*set_errpfx) (DB_ENV *, const char *)", 1536, 8},
   {"int  (*set_flags) (DB_ENV *, u_int32_t, int)", 1560, 8},
   {"int  (*set_lg_bsize) (DB_ENV *, u_int32_t)", 1584, 8},
@@ -60,6 +62,7 @@ struct fieldinfo db_fields64[] = {
   {"int (*rename) (DB *, const char *, const char *, const char *, u_int32_t)", 832, 8},
   {"int (*set_bt_compare) (DB *, int (*)(DB *, const DBT *, const DBT *))", 856, 8},
   {"int (*set_dup_compare) (DB *, int (*)(DB *, const DBT *, const DBT *))", 888, 8},
+  {"void (*set_errfile) (DB *, FILE*)", 912, 8},
   {"int (*set_flags) (DB *, u_int32_t)", 936, 8},
   {"int (*set_pagesize) (DB *, u_int32_t)", 1000, 8},
   {"int (*stat) (DB *, void *, u_int32_t)", 1064, 8},
@@ -72,6 +75,7 @@ struct fieldinfo db_txn_active_fields64[] = {
   {0, 232, 232} /* size of whole struct */
 };
 struct fieldinfo db_txn_fields64[] = {
+  {"void *api_internal", 168, 8},
   {"int (*abort) (DB_TXN *)", 192, 8},
   {"int (*commit) (DB_TXN*, u_int32_t)", 200, 8},
   {"u_int32_t (*id) (DB_TXN *)", 224, 8},