You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
44 lines
1.7 KiB
44 lines
1.7 KiB
Index: cmake_modules/TokuFeatureDetection.cmake |
|
--- cmake_modules/TokuFeatureDetection.cmake.orig 2015-01-02 15:50:51.000000000 +0100 |
|
+++ cmake_modules/TokuFeatureDetection.cmake 2015-01-14 16:50:35.806499091 +0100 |
|
@@ -87,7 +87,7 @@ |
|
endif () |
|
check_function_exists(backtrace HAVE_BACKTRACE_WITHOUT_EXECINFO) |
|
if (NOT HAVE_BACKTRACE_WITHOUT_EXECINFO) |
|
- set(CMAKE_REQUIRED_LIBRARIES execinfo) |
|
+ set(CMAKE_REQUIRED_LIBRARIES execinfo m) |
|
check_function_exists(backtrace HAVE_BACKTRACE_WITH_EXECINFO) |
|
if (HAVE_BACKTRACE_WITH_EXECINFO) |
|
list(APPEND EXTRA_SYSTEM_LIBS execinfo) |
|
Index: ft/ft-ops.cc |
|
--- ft/ft-ops.cc.orig 2015-01-02 15:50:51.000000000 +0100 |
|
+++ ft/ft-ops.cc 2015-01-14 17:11:30.436417489 +0100 |
|
@@ -2968,6 +2968,7 @@ |
|
FT ft = NULL; |
|
bool did_create = false; |
|
toku_ft_open_close_lock(); |
|
+ bool was_already_open = false; |
|
|
|
if (ft_h->did_set_flags) { |
|
r = verify_builtin_comparisons_consistent(ft_h, ft_h->options.flags); |
|
@@ -2978,7 +2979,6 @@ |
|
FILENUM reserved_filenum; |
|
reserved_filenum = use_filenum; |
|
fname_in_cwd = toku_cachetable_get_fname_in_cwd(cachetable, fname_in_env); |
|
- bool was_already_open; |
|
{ |
|
int fd = -1; |
|
r = ft_open_file(fname_in_cwd, &fd); |
|
Index: src/ydb.cc |
|
--- src/ydb.cc.orig 2015-01-02 15:50:51.000000000 +0100 |
|
+++ src/ydb.cc 2015-01-14 17:16:22.986345692 +0100 |
|
@@ -278,7 +278,8 @@ |
|
int in_red; // set true to prevent certain operations (returning ENOSPC) |
|
|
|
// get the fs sizes for the home dir |
|
- uint64_t avail_size, total_size; |
|
+ uint64_t avail_size = 0; |
|
+ uint64_t total_size = 0; |
|
r = toku_get_filesystem_sizes(env->i->dir, &avail_size, NULL, &total_size); |
|
assert(r == 0); |
|
in_yellow = (avail_size < 2 * env_fs_redzone(env, total_size));
|
|
|