diff options
author | Sergei Golubchik <sergii@pisem.net> | 2014-03-26 22:25:38 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-26 22:25:38 +0100 |
commit | 10740939eb824bbd792352f654380e258edd7675 (patch) | |
tree | a4c68f331f0470b8bd30822de5938a6552f69738 /storage/tokudb/ft-index/src/ydb-internal.h | |
parent | a91c59c2affdebb4b34c2c8000b0b1648d43046d (diff) | |
parent | 44002a34e680c79c01df879b540458c2885e97e8 (diff) | |
download | mariadb-git-10740939eb824bbd792352f654380e258edd7675.tar.gz |
5.5 merge
Diffstat (limited to 'storage/tokudb/ft-index/src/ydb-internal.h')
-rw-r--r-- | storage/tokudb/ft-index/src/ydb-internal.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/storage/tokudb/ft-index/src/ydb-internal.h b/storage/tokudb/ft-index/src/ydb-internal.h index fe1113d2c0d..f8c10975d5a 100644 --- a/storage/tokudb/ft-index/src/ydb-internal.h +++ b/storage/tokudb/ft-index/src/ydb-internal.h @@ -182,7 +182,12 @@ struct __toku_db_env_internal { int datadir_lockfd; int logdir_lockfd; int tmpdir_lockfd; - uint64_t loader_memory_size; + uint64_t (*get_loader_memory_size_callback)(void); + uint64_t default_lock_timeout_msec; + uint64_t (*get_lock_timeout_callback)(uint64_t default_lock_timeout_msec); + uint64_t default_killed_time_msec; + uint64_t (*get_killed_time_callback)(uint64_t default_killed_time_msec); + int (*killed_callback)(void); }; // test-only environment function for running lock escalation |