aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordan <dan@noemail.net>2010-08-09 16:12:51 +0000
committerdan <dan@noemail.net>2010-08-09 16:12:51 +0000
commit5198bead7ab8ef007af9c7902084c4b5fc652df8 (patch)
tree66fb71ff03ff6a9fb1c96d3f564c9fb805a1dbf8 /src
parentec561a351a08fb842caa2e65f4a3b601f4446793 (diff)
downloadsqlite-5198bead7ab8ef007af9c7902084c4b5fc652df8.tar.gz
sqlite-5198bead7ab8ef007af9c7902084c4b5fc652df8.zip
Fix a memory leak in test_journal.c causing tests to fail.
FossilOrigin-Name: f229487cccc7514b2663e8e6e04798702c9cfb10
Diffstat (limited to 'src')
-rw-r--r--src/pager.c2
-rw-r--r--src/test_journal.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/pager.c b/src/pager.c
index b68d3cbb8..4c5bd662c 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -901,7 +901,7 @@ static char *print_pager_state(Pager *p){
p->eState==PAGER_WRITER_FINISHED ? "WRITER_FINISHED" :
p->eState==PAGER_ERROR ? "ERROR" : "?error?"
, (int)p->errCode
- , p->eLock==NO_LOCK ? "OPEN" :
+ , p->eLock==NO_LOCK ? "NO_LOCK" :
p->eLock==RESERVED_LOCK ? "RESERVED" :
p->eLock==EXCLUSIVE_LOCK ? "EXCLUSIVE" :
p->eLock==SHARED_LOCK ? "SHARED" :
diff --git a/src/test_journal.c b/src/test_journal.c
index 0300fb871..ca4c5c388 100644
--- a/src/test_journal.c
+++ b/src/test_journal.c
@@ -361,6 +361,7 @@ static int openTransaction(jt_file *pMain, jt_file *pJournal){
sqlite3_file *p = pMain->pReal;
int rc = SQLITE_OK;
+ closeTransaction(pMain);
aData = sqlite3_malloc(pMain->nPagesize);
pMain->pWritable = sqlite3BitvecCreate(pMain->nPage);
pMain->aCksum = sqlite3_malloc(sizeof(u32) * (pMain->nPage + 1));