Commit 9e022902 authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel

closes[t:2642] fix a mem leak in the brtloader found with the cleanup test

git-svn-id: file:///svn/toku/tokudb@20627 c7de825b-a66e-492c-adef-691d508d4ae1
parent 53a5c307
...@@ -1744,7 +1744,6 @@ int merge_files (struct merge_fileset *fs, ...@@ -1744,7 +1744,6 @@ int merge_files (struct merge_fileset *fs,
} }
if (result==0 && !to_queue) { if (result==0 && !to_queue) {
result = extend_fileset(bl, &next_file_set, &merged_data); result = extend_fileset(bl, &next_file_set, &merged_data);
if (result!=0) { break; }
} }
if (result==0) { if (result==0) {
......
...@@ -196,7 +196,7 @@ static char *merge(char **tempfiles, int ntempfiles, const char *testdir) { ...@@ -196,7 +196,7 @@ static char *merge(char **tempfiles, int ntempfiles, const char *testdir) {
// write min // write min
write_row(mergef, &f[mini].key, &f[mini].val); write_row(mergef, &f[mini].key, &f[mini].val);
// refresh i // refresh mini
if (read_row(f[mini].f, &f[mini].key, &f[mini].val) != 0) if (read_row(f[mini].f, &f[mini].key, &f[mini].val) != 0)
f[mini].row_valid = FALSE; f[mini].row_valid = FALSE;
} }
......
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