Commit aade4f7e authored by Bradley C. Kuszmaul's avatar Bradley C. Kuszmaul Committed by Yoni Fogel

[t:4050] Make things compile on more systems. Refs #4050.

git-svn-id: file:///svn/toku/tokudb@39884 c7de825b-a66e-492c-adef-691d508d4ae1
parent ebe4ac77
...@@ -121,6 +121,7 @@ BDB_DONTRUN_TESTS = \ ...@@ -121,6 +121,7 @@ BDB_DONTRUN_TESTS = \
cursor-isolation \ cursor-isolation \
cursor-set-del-rmw \ cursor-set-del-rmw \
cursor-set-range-rmw \ cursor-set-range-rmw \
db-put-simple-deadlock \
del-simple \ del-simple \
del-multiple \ del-multiple \
del-multiple-huge-primary-row \ del-multiple-huge-primary-row \
...@@ -149,7 +150,7 @@ BDB_DONTRUN_TESTS = \ ...@@ -149,7 +150,7 @@ BDB_DONTRUN_TESTS = \
hotindexer-simple-abort \ hotindexer-simple-abort \
hotindexer-undo-do-test \ hotindexer-undo-do-test \
hotindexer-with-queries \ hotindexer-with-queries \
hot-optimize-table-tests \ hot-optimize-table-tests \
insert-dup-prelock \ insert-dup-prelock \
isolation \ isolation \
isolation-read-committed \ isolation-read-committed \
...@@ -292,10 +293,10 @@ BDB_DONTRUN_TESTS = \ ...@@ -292,10 +293,10 @@ BDB_DONTRUN_TESTS = \
test_dbremove_old \ test_dbremove_old \
test_dupsort_get_both_range_reverse \ test_dupsort_get_both_range_reverse \
test_dupsort_set_range_reverse \ test_dupsort_set_range_reverse \
test_get_max_row_size \ test_get_max_row_size \
test_large_update_broadcast_small_cachetable \ test_large_update_broadcast_small_cachetable \
test_logflush \ test_logflush \
test_multiple_checkpoints_block_commit \ test_multiple_checkpoints_block_commit \
test_query \ test_query \
test_rand_insert_mult_db \ test_rand_insert_mult_db \
test_redirect_func \ test_redirect_func \
......
...@@ -51,7 +51,9 @@ test_main (int argc, char * const argv[]) { ...@@ -51,7 +51,9 @@ test_main (int argc, char * const argv[]) {
parse_args(argc, argv); parse_args(argc, argv);
setup(FLAGS_LOG); setup(FLAGS_LOG);
env->txn_checkpoint(env, 0, 0, 0); env->txn_checkpoint(env, 0, 0, 0);
#ifdef USE_TDB
print_engine_status(env); print_engine_status(env);
#endif
test_shutdown(); test_shutdown();
return 0; return 0;
} }
...@@ -113,9 +113,9 @@ parse_args (int argc, char * const argv[]) { ...@@ -113,9 +113,9 @@ parse_args (int argc, char * const argv[]) {
} }
} }
#ifdef USE_TDB
static __attribute__((__unused__)) void static __attribute__((__unused__)) void
print_engine_status(DB_ENV * UU(env)) { print_engine_status(DB_ENV * UU(env)) {
#ifdef USE_TDB
if (verbose) { // verbose declared statically in this file if (verbose) { // verbose declared statically in this file
uint64_t nrows; uint64_t nrows;
env->get_engine_status_num_rows(env, &nrows); env->get_engine_status_num_rows(env, &nrows);
...@@ -125,13 +125,14 @@ print_engine_status(DB_ENV * UU(env)) { ...@@ -125,13 +125,14 @@ print_engine_status(DB_ENV * UU(env)) {
printf("Engine status:\n"); printf("Engine status:\n");
printf("%s", buff); printf("%s", buff);
} }
#endif
} }
#endif
#ifdef USE_TDB
static __attribute__((__unused__)) uint64_t static __attribute__((__unused__)) uint64_t
get_engine_status_val(DB_ENV * UU(env), char * keyname) { get_engine_status_val(DB_ENV * UU(env), char * keyname) {
uint64_t rval = 0; uint64_t rval = 0;
#ifdef USE_TDB
uint64_t nrows; uint64_t nrows;
env->get_engine_status_num_rows(env, &nrows); env->get_engine_status_num_rows(env, &nrows);
TOKU_ENGINE_STATUS_ROW_S mystat[nrows]; TOKU_ENGINE_STATUS_ROW_S mystat[nrows];
...@@ -149,11 +150,9 @@ get_engine_status_val(DB_ENV * UU(env), char * keyname) { ...@@ -149,11 +150,9 @@ get_engine_status_val(DB_ENV * UU(env), char * keyname) {
} }
} }
CKERR2(found, 1); CKERR2(found, 1);
#endif
return rval; return rval;
} }
#endif
static __attribute__((__unused__)) DBT * static __attribute__((__unused__)) DBT *
dbt_init(DBT *dbt, const void *data, u_int32_t size) { dbt_init(DBT *dbt, const void *data, u_int32_t size) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment