aboutsummaryrefslogtreecommitdiff
path: root/src/pager.c
diff options
context:
space:
mode:
authordanielk1977 <danielk1977@noemail.net>2008-05-15 11:08:07 +0000
committerdanielk1977 <danielk1977@noemail.net>2008-05-15 11:08:07 +0000
commitdad31b5e110eb7c80b898a7922f28fce02f44db6 (patch)
tree39aafb6245c7b45debf8469817f97fbddccf8cd4 /src/pager.c
parent28bbd223071b090b99aae1020c738c75113edbf4 (diff)
downloadsqlite-dad31b5e110eb7c80b898a7922f28fce02f44db6.tar.gz
sqlite-dad31b5e110eb7c80b898a7922f28fce02f44db6.zip
If a pager is already in the error-state when CommitPhaseOne() is called, exit early. (CVS 5134)
FossilOrigin-Name: 443cf1056c73ae89d0efcc7a462455c078b3a4a8
Diffstat (limited to 'src/pager.c')
-rw-r--r--src/pager.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/pager.c b/src/pager.c
index 106883f4a..c284f4d53 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -18,7 +18,7 @@
** file simultaneously, or one process from reading the database while
** another is writing.
**
-** @(#) $Id: pager.c,v 1.447 2008/05/15 08:34:54 danielk1977 Exp $
+** @(#) $Id: pager.c,v 1.448 2008/05/15 11:08:08 danielk1977 Exp $
*/
#ifndef SQLITE_OMIT_DISKIO
#include "sqliteInt.h"
@@ -4614,6 +4614,10 @@ int sqlite3PagerCommitPhaseOne(
){
int rc = SQLITE_OK;
+ if( pPager->errCode ){
+ return pPager->errCode;
+ }
+
/* If no changes have been made, we can leave the transaction early.
*/
if( pPager->dbModified==0 &&