Fix an error checked in as part of (5350). (CVS 5353)

FossilOrigin-Name: acfb2b41ae66307ba80b6245aced9cc1d8092189

diff --git a/manifest b/manifest
index 8101f302eb97ea70f7e3af83711d36171bd66fca..43072a82e6c1271970c4dcc5f98a28bae5e0b215 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Another\stest\scase\sto\stest\sa\sspecific\skind\sof\sdatabase\scorruption.\s(CVS\s5352)
-D 2008-07-07T17:04:23
+C Fix\san\serror\schecked\sin\sas\spart\sof\s(5350).\s(CVS\s5353)
+D 2008-07-07T17:13:09
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 325dfac0a0dd1cb4d975f1ace6453157892e6042
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -181,7 +181,7 @@ F src/update.c 2d7143b9014e955509cc4f323f9a9584fb898f34
 F src/utf.c 8d52f620a7153d90b058502124fe51d821fcdf57
 F src/util.c aec21ebb1e21f6220af1237078b1723968803990
 F src/vacuum.c 14eb21b480924d87e791cd8ab6fb35ac563243ef
-F src/vdbe.c 8adaa7524e9a297718d3ef0395ec46752eb14943
+F src/vdbe.c fb6df1bd31a321647b4677f5d20716d8f7f71255
 F src/vdbe.h c46155c221418bea29ee3a749d5950fcf85a70e2
 F src/vdbeInt.h 30535c1d30ba1b5fb58d8f0e1d1261af976558aa
 F src/vdbeapi.c a7c6b8db324cf7eccff32de871dea36aa305c994
@@ -598,7 +598,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P cbb9536fc4fb2419e0eb6f3a32c67eeb7a73da82
-R 299fe13e17e3bd62ef5df1494e777b26
+P 38e04d67635d49661f9b95338fc1cb8197bf0bc7
+R 78060972ae886eae791f694f62a0db49
 U danielk1977
-Z 4ddebf708c0493772a69797365fbfc53
+Z 7cfb7b4d0ecbf47a8d1f1b2a4da8cfc3

diff --git a/manifest.uuid b/manifest.uuid
index 72e3fc4ca3626a3ccf379bb81264e195c64cbb60..3b5ccbf0a69a940d05c6f07d6bba53acd1114193 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-38e04d67635d49661f9b95338fc1cb8197bf0bc7
\ No newline at end of file
+acfb2b41ae66307ba80b6245aced9cc1d8092189
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index d125fabd5ac3e5c49418a82133a4ba16e24d7f40..255ce71c7b3e7358021b133590db57a369cbd354 100644 (file)
--- 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.757 2008/07/07 14:56:57 danielk1977 Exp $
+** $Id: vdbe.c,v 1.758 2008/07/07 17:13:09 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -2517,7 +2517,7 @@ case OP_Transaction: {
       p->rc = rc = SQLITE_BUSY;
       goto vdbe_return;
     }
-    if( rc!=SQLITE_OK && rc!=SQLITE_READONLY && /* rc!=SQLITE_BUSY */ ){
+    if( rc!=SQLITE_OK && rc!=SQLITE_READONLY /* && rc!=SQLITE_BUSY */ ){
       goto abort_due_to_error;
     }
   }