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

Another fix for #1472 (if error_string is NULL we segfaulted.) Refs #1472.

git-svn-id: file:///svn/toku/tokudb@10310 c7de825b-a66e-492c-adef-691d508d4ae1
parent fb8a99f9
...@@ -3040,9 +3040,9 @@ int toku_close_brt (BRT brt, TOKULOGGER logger, char **error_string) { ...@@ -3040,9 +3040,9 @@ int toku_close_brt (BRT brt, TOKULOGGER logger, char **error_string) {
assert(0==toku_cachefile_count_pinned(brt->cf, 1)); // For the brt, the pinned count should be zero (but if panic, don't worry) assert(0==toku_cachefile_count_pinned(brt->cf, 1)); // For the brt, the pinned count should be zero (but if panic, don't worry)
//printf("%s:%d closing cachetable\n", __FILE__, __LINE__); //printf("%s:%d closing cachetable\n", __FILE__, __LINE__);
// printf("%s:%d brt=%p ,brt->h=%p\n", __FILE__, __LINE__, brt, brt->h); // printf("%s:%d brt=%p ,brt->h=%p\n", __FILE__, __LINE__, brt, brt->h);
assert(*error_string == 0); if (error_string) assert(*error_string == 0);
r = toku_cachefile_close(&brt->cf, logger, error_string); r = toku_cachefile_close(&brt->cf, logger, error_string);
if (r==0) assert(*error_string == 0); if (r==0 && error_string) assert(*error_string == 0);
} }
if (brt->database_name) toku_free(brt->database_name); if (brt->database_name) toku_free(brt->database_name);
if (brt->fname) toku_free(brt->fname); if (brt->fname) toku_free(brt->fname);
......
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