From e191dd014ee674f8754bec6c385ad4ccd84eeb87 Mon Sep 17 00:00:00 2001
From: Barry Perlman <barry@tokutek.com>
Date: Tue, 16 Apr 2013 23:57:53 -0400
Subject: [PATCH] Merged from 2.0.0 branch with command: svn merge -r12118:HEAD
 ../../mysql.branches/2.0.0/tokudb/

git-svn-id: file:///svn/toku/tokudb@12124 c7de825b-a66e-492c-adef-691d508d4ae1
---
 newbrt/logformat.c                | 4 ++--
 src/tests/checkpoint_truncate_1.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/newbrt/logformat.c b/newbrt/logformat.c
index c3ea1dc7415..978749035f5 100644
--- a/newbrt/logformat.c
+++ b/newbrt/logformat.c
@@ -92,9 +92,9 @@ const struct logtype rollbacks[] = {
 const struct logtype logtypes[] = {
     // Records produced by checkpoints
     {"begin_checkpoint", 'x', FA{NULLFIELD}},
-    {"end_checkpoint",   'X', FA{{"TXNID", "txnid", 0}, NULLFIELD}},
+    {"end_checkpoint",   'X', FA{{"TXNID", "txnid", 0}, NULLFIELD}},  // TXNID is LSN of begin_checkpoint
     {"fassociate",  'f', FA{{"FILENUM", "filenum", 0},
-			    {"BYTESTRING", "fname", 0},
+			    {"BYTESTRING", "fname", 0},   // pathname of file
 			    NULLFIELD}},
     {"xstillopen", 's', FA{{"TXNID", "txnid", 0}, NULLFIELD}}, // only record root transactions
     // Reords produced by transactions
diff --git a/src/tests/checkpoint_truncate_1.c b/src/tests/checkpoint_truncate_1.c
index 5c4081ce10a..de68af6c04a 100644
--- a/src/tests/checkpoint_truncate_1.c
+++ b/src/tests/checkpoint_truncate_1.c
@@ -92,7 +92,7 @@ void checkpoint_callback_1(void * extra) {
 
 int
 test_main (int argc, char *argv[]) {
-    int limit = 512;
+    int limit = 4;
     parse_args(argc, argv);
 
     db_env_set_checkpoint_callback(checkpoint_callback_1, &test_dictionary);
-- 
2.30.9