[t:2892], undo bad checkin

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

newbrt/dbufio.c

@@ -378,7 +378,7 @@ dbufio_print(DBUFIO_FILESET bfs) {
     fprintf(stderr, "%s:%d bfs=%p", __FILE__, __LINE__, bfs);
     if (bfs->panic)
         fprintf(stderr, " panic=%d", bfs->panic_errno);
-    //fprintf(stderr, " N=%d %d %"PRIuMAX, bfs->N, bfs->n_not_done, bfs->bufsize);
+    fprintf(stderr, " N=%d %d %"PRIuMAX, bfs->N, bfs->n_not_done, bfs->bufsize);
     for (int i = 0; i < bfs->N; i++) {
         struct dbufio_file *dbf = &bfs->files[i];
         if (dbf->error_code[0] || dbf->error_code[1])

newbrt/logger.c

@@ -775,13 +775,13 @@ int toku_logger_maybe_fsync (TOKULOGGER logger, LSN lsn, int do_fsync)
 	write_outbuf_to_logfile(logger, &fsynced_lsn);
 	if (fsynced_lsn.lsn < lsn.lsn) {
 	    // it may have gotten fsynced by the write_outbuf_to_logfile.
-            //toku_add_trace_mem("fsync", __LINE__);
+            toku_add_trace_mem("fsync", __LINE__);
 	    r = toku_file_fsync_without_accounting(logger->fd);
 	    if (r!=0) {
 		toku_logger_panic(logger, r);
 		return r;
 	    }
-            //toku_add_trace_mem("fsyncdone", __LINE__);
+            toku_add_trace_mem("fsyncdone", __LINE__);
 	    assert(fsynced_lsn.lsn <= logger->written_lsn.lsn);
 	    fsynced_lsn = logger->written_lsn;
 	}

newbrt/threadpool.c

@@ -188,8 +188,6 @@ toku_thread_pool_add(struct toku_thread_pool *pool) {
     return r;
 }   
 
-#define EWOULDBLOCK 10101
-
 // get one thread from the free pool.  
 static int 
 toku_thread_pool_get_one(struct toku_thread_pool *pool, int dowait, struct toku_thread **toku_thread_return) {

newbrt/ule.c

@@ -1798,9 +1798,9 @@ le_iterate_is_empty(LEAFENTRY le, LE_ITERATE_CALLBACK f, BOOL *is_emptyp, TOKUTX
 }
 
 //
-// Iterates over TXNIDs relevant for MVCC reads in a leafentry's stack, until one is accepted by 'f'. Set
+// Iterates over "possible" TXNIDs in a leafentry's stack, until one is accepted by 'f'. Set
 // valpp and vallenp to value and length associated with accepted TXNID
-// The relevant TXNIDs are:
+// The "possible" TXNIDs are:
 //   if provisionals exist, then the first possible TXNID is the outermost provisional.
 //   The next possible TXNIDs are the committed TXNIDs, from most recently committed to T_0.
 // If provisionals exist, and the outermost provisional is accepted by 'f', 
@@ -2019,6 +2019,7 @@ bool transaction_open(TXNID xid) {
 
 #endif
 
+#if BRT_LAYOUT_MIN_SUPPORTED_VERSION <= BRT_LAYOUT_VERSION_12 
 #if TOKU_WINDOWS
 #pragma pack(push, 1)
 #endif
@@ -2215,3 +2216,5 @@ toku_le_upgrade_12_13(LEAFENTRY_12 old_leafentry,
     return rval;
 }
 
+#endif
+