fix the recovery tests. close[t:1910]

git-svn-id: file:///svn/toku/tokudb@13835 c7de825b-a66e-492c-adef-691d508d4ae1

newbrt/logger.c

@@ -5,7 +5,7 @@
 
 #include "includes.h"
 
-static const int log_format_version=1;
+static const int log_format_version=TOKU_LOG_VERSION;
 
 static toku_pthread_mutex_t logger_mutex = TOKU_PTHREAD_MUTEX_INITIALIZER;
 

newbrt/logger.h

@@ -5,6 +5,8 @@
 #ident "Copyright (c) 2007, 2008, 2009 Tokutek Inc.  All rights reserved."
 #ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
 
+enum { TOKU_LOG_VERSION = 1 };
+
 int toku_logger_create (TOKULOGGER *resultp);
 int toku_logger_open (const char *directory, TOKULOGGER logger);
 int toku_logger_log_bytes (TOKULOGGER logger, struct logbytes *bytes, int do_fsync);

newbrt/recover.c

@@ -581,7 +581,7 @@ int tokudb_recover(const char *data_dir, const char *log_dir) {
 	u_int32_t version;
 	//printf("Reading file %d: %s\n", j, logfiles[j]);
 	r=toku_read_logmagic(f, &version);
-	assert(r==0 && version==0);
+	assert(r==0 && version==TOKU_LOG_VERSION);
     go_forward: // we have an open file, so go forward.
 	//printf("Going forward\n");
 	r=chdir(data_wd);