From 68c02737557c3742e23a5a46ba47b9a7618c0748 Mon Sep 17 00:00:00 2001
From: shane <shane@noemail.net>
Date: Tue, 9 Jun 2009 18:14:18 +0000
Subject: [PATCH] Avoid a false failure report in the test scripts caused by
 the vdbe stack "compression" script. (CVS 6740)

FossilOrigin-Name: 9d3329891c2227a1a3ded1c636ac615864010ca7
---
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 src/vdbe.c    | 16 ++++++++--------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/manifest b/manifest
index dc5a39cb0b..39dcb9ef9d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Require\sthat\sthe\sbuffer\sspecified\sby\sSQLITE_CONFIG_HEAP\sbe\s8-byte\saligned.\s(CVS\s6739)
-D 2009-06-09T18:02:10
+C Avoid\sa\sfalse\sfailure\sreport\sin\sthe\stest\sscripts\scaused\sby\sthe\svdbe\sstack\s"compression"\sscript.\s(CVS\s6740)
+D 2009-06-09T18:14:18
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 8b8fb7823264331210cddf103831816c286ba446
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -203,7 +203,7 @@ F src/update.c 6ae6c26adff8dc34532d578f66e6cfde04b5d177
 F src/utf.c 9541d28f40441812c0b40f00334372a0542c00ff
 F src/util.c 8ff385a6b474e840d4fa3621f5f7263028ac892c
 F src/vacuum.c 0e14f371ea3326c6b8cfba257286d798cd20db59
-F src/vdbe.c 434e3803de90697cfa6cc53f0f6719a575cde107
+F src/vdbe.c 60ca5ae05f5ab4ec10336465817931fc1002768e
 F src/vdbe.h 35a648bc3279a120da24f34d9a25213ec15daf8a
 F src/vdbeInt.h 3727128255a93d116e454f67d4559700f7ae4d6f
 F src/vdbeapi.c 619992b16821b989050e8a12e259d795d30731a9
@@ -733,7 +733,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P 5e8c48cff7e96e6030b796dba409844f4c758a60
-R cd4064526d818accd8a7986c2bb8a4af
-U drh
-Z 7b1665741275b81f0c1d362ef376953e
+P 18b78068cc94de51f081824c93f7b14c7c35726d
+R fdd2a933c6c72fa79bbfccb46e96d6c4
+U shane
+Z 807e1768f9d656e19f7ada248b0bfe4c
diff --git a/manifest.uuid b/manifest.uuid
index 3f8bec4d95..bfb9e8eb34 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-18b78068cc94de51f081824c93f7b14c7c35726d
\ No newline at end of file
+9d3329891c2227a1a3ded1c636ac615864010ca7
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index 1e4c80d372..70878a7ba1 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.848 2009/06/05 16:46:53 drh Exp $
+** $Id: vdbe.c,v 1.849 2009/06/09 18:14:18 shane Exp $
 */
 #include "sqliteInt.h"
 #include "vdbeInt.h"
@@ -2645,17 +2645,17 @@ case OP_Savepoint: {
 */
 case OP_AutoCommit: {
   int desiredAutoCommit;
-  int rollback;
+  int iRollback;
   int turnOnAC;
 
   desiredAutoCommit = pOp->p1;
-  rollback = pOp->p2;
+  iRollback = pOp->p2;
   turnOnAC = desiredAutoCommit && !db->autoCommit;
   assert( desiredAutoCommit==1 || desiredAutoCommit==0 );
-  assert( desiredAutoCommit==1 || rollback==0 );
+  assert( desiredAutoCommit==1 || iRollback==0 );
   assert( db->activeVdbeCnt>0 );  /* At least this one VM is active */
 
-  if( turnOnAC && rollback && db->activeVdbeCnt>1 ){
+  if( turnOnAC && iRollback && db->activeVdbeCnt>1 ){
     /* If this instruction implements a ROLLBACK and other VMs are
     ** still running, and a transaction is active, return an error indicating
     ** that the other VMs must complete first. 
@@ -2663,7 +2663,7 @@ case OP_AutoCommit: {
     sqlite3SetString(&p->zErrMsg, db, "cannot rollback transaction - "
         "SQL statements in progress");
     rc = SQLITE_BUSY;
-  }else if( turnOnAC && !rollback && db->writeVdbeCnt>1 ){
+  }else if( turnOnAC && !iRollback && db->writeVdbeCnt>1 ){
     /* If this instruction implements a COMMIT and other VMs are writing
     ** return an error indicating that the other VMs must complete first. 
     */
@@ -2671,7 +2671,7 @@ case OP_AutoCommit: {
         "SQL statements in progress");
     rc = SQLITE_BUSY;
   }else if( desiredAutoCommit!=db->autoCommit ){
-    if( rollback ){
+    if( iRollback ){
       assert( desiredAutoCommit==1 );
       sqlite3RollbackAll(db);
       db->autoCommit = 1;
@@ -2695,7 +2695,7 @@ case OP_AutoCommit: {
   }else{
     sqlite3SetString(&p->zErrMsg, db,
         (!desiredAutoCommit)?"cannot start a transaction within a transaction":(
-        (rollback)?"cannot rollback - no transaction is active":
+        (iRollback)?"cannot rollback - no transaction is active":
                    "cannot commit - no transaction is active"));
          
     rc = SQLITE_ERROR;