Remove the SQLITE_CommitBusy flag. This was an attempt to block recursion
on the sqlite3_commit_hook() interface. But such recursion is explicitly
disallowed, so the flag is pointless. (CVS 6889)
FossilOrigin-Name: 1c2bfc43a4fd5b779a3b5b5b8ca5b41cb7250b5a
diff --git a/src/pager.c b/src/pager.c
index 0b2c787..1294fd9 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.607 2009/07/13 11:22:10 danielk1977 Exp $
+** @(#) $Id: pager.c,v 1.608 2009/07/13 15:52:38 drh Exp $
*/
#ifndef SQLITE_OMIT_DISKIO
#include "sqliteInt.h"
@@ -1624,7 +1624,7 @@
** by a valid checksum.
**
** The pager never needs to know this in order to do its job. This
-** routine is only used from with assert() and testcase() macros.
+** routine is only used from within assert() and testcase() macros.
*/
static int pagerNextJournalPageIsValid(Pager *pPager){
Pgno pgno; /* The page number of the page */
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 8420425..5427fc7 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
*************************************************************************
** Internal interface definitions for SQLite.
**
-** @(#) $Id: sqliteInt.h,v 1.892 2009/07/03 22:54:37 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.893 2009/07/13 15:52:38 drh Exp $
*/
#ifndef _SQLITEINT_H_
#define _SQLITEINT_H_
@@ -906,8 +906,7 @@
#define SQLITE_RecoveryMode 0x00040000 /* Ignore schema errors */
#define SQLITE_SharedCache 0x00080000 /* Cache sharing is enabled */
-#define SQLITE_CommitBusy 0x00200000 /* In the process of committing */
-#define SQLITE_ReverseOrder 0x00400000 /* Reverse unordered SELECTs */
+#define SQLITE_ReverseOrder 0x00100000 /* Reverse unordered SELECTs */
/*
** Possible values for the sqlite.magic field.
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 881c142..9e98db2 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -14,7 +14,7 @@
** to version 2.8.7, all this code was combined into the vdbe.c source file.
** But that file was getting too big so this subroutines were split out.
**
-** $Id: vdbeaux.c,v 1.470 2009/07/08 08:05:35 danielk1977 Exp $
+** $Id: vdbeaux.c,v 1.471 2009/07/13 15:52:38 drh Exp $
*/
#include "sqliteInt.h"
#include "vdbeInt.h"
@@ -1368,12 +1368,9 @@
/* If there are any write-transactions at all, invoke the commit hook */
if( needXcommit && db->xCommitCallback ){
- assert( (db->flags & SQLITE_CommitBusy)==0 );
- db->flags |= SQLITE_CommitBusy;
(void)sqlite3SafetyOff(db);
rc = db->xCommitCallback(db->pCommitArg);
(void)sqlite3SafetyOn(db);
- db->flags &= ~SQLITE_CommitBusy;
if( rc ){
return SQLITE_CONSTRAINT;
}
@@ -1620,8 +1617,9 @@
/* If p->iStatement is greater than zero, then this Vdbe opened a
** statement transaction that should be closed here. The only exception
** is that an IO error may have occured, causing an emergency rollback.
- ** In this case (db->nStatement==0), and there is nothing to do. */
- if( p->iStatement && db->nStatement ){
+ ** In this case (db->nStatement==0), and there is nothing to do.
+ */
+ if( db->nStatement && p->iStatement ){
int i;
const int iSavepoint = p->iStatement-1;
@@ -1761,7 +1759,6 @@
if( !sqlite3VtabInSync(db)
&& db->autoCommit
&& db->writeVdbeCnt==(p->readOnly==0)
- && (db->flags & SQLITE_CommitBusy)==0
){
if( p->rc==SQLITE_OK || (p->errorAction==OE_Fail && !isSpecialError) ){
/* The auto-commit flag is true, and the vdbe program was