/ Check-in [1958db44]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix a bug where a condition was incorrectly being compiled out when SQLITE_OMIT_VIRTUALTABLE was defined.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 1958db4493461b3a54217a6a45f2730287107860
User & Date: dan 2009-09-07 17:32:35
Context
2009-09-07
17:41
Merge 1958db4493 and 26cd015c0e. check-in: ecbe0832 user: dan tags: trunk
17:32
Fix a bug where a condition was incorrectly being compiled out when SQLITE_OMIT_VIRTUALTABLE was defined. check-in: 1958db44 user: dan tags: trunk
2009-09-03
01:18
Do not reuse function parameters in subsequent expressions since the function call might have triggered a text encoding change. Fix for ticket [2ea2425d34be]. check-in: f22e3887 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/vdbeaux.c.

   286    286       if( opcode==OP_Halt ){
   287    287         if( pOp->p1==SQLITE_CONSTRAINT && pOp->p2==OE_Abort ){
   288    288           doesStatementRollback = 1;
   289    289         }
   290    290       }else if( opcode==OP_Statement ){
   291    291         hasStatementBegin = 1;
   292    292         p->usesStmtJournal = 1;
   293         -    }else if( opcode==OP_Destroy ){
          293  +    }else if( opcode==OP_Destroy || opcode==OP_Program ){
   294    294         doesStatementRollback = 1;
   295    295       }else if( opcode==OP_Transaction && pOp->p2!=0 ){
   296    296         p->readOnly = 0;
   297    297   #ifndef SQLITE_OMIT_VIRTUALTABLE
   298         -    }else if( opcode==OP_VUpdate || opcode==OP_VRename || opcode==OP_Program ){
          298  +    }else if( opcode==OP_VUpdate || opcode==OP_VRename ){
   299    299         doesStatementRollback = 1;
   300    300       }else if( opcode==OP_VFilter ){
   301    301         int n;
   302    302         assert( p->nOp - i >= 3 );
   303    303         assert( pOp[-1].opcode==OP_Integer );
   304    304         n = pOp[-1].p1;
   305    305         if( n>nMaxArgs ) nMaxArgs = n;