From: drh <drh@noemail.net>
Date: Fri, 4 Jun 2004 19:07:53 +0000 (+0000)
Subject: Calling sqlite_interrupt() while VACUUM is running should not cause an error. (CVS... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=97117601d2d8c048ccd0b5cf73bfe5c59f650854;p=thirdparty%2Fsqlite.git

Calling sqlite_interrupt() while VACUUM is running should not cause an error. (CVS 1529)

FossilOrigin-Name: 1cf94a7c41b56506251a9964f133e179bd06825f
---

diff --git a/manifest b/manifest
index 543f3efa81..5e3e97be1c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvements\sto\stesting\sof\ssqlite_interrupt.\s\sMore\schecking\sfor\sinterrupt\ninside\sof\sVACUUM.\s(CVS\s1344)
-D 2004-05-10T20:27:41
+C Calling\ssqlite_interrupt()\swhile\sVACUUM\sis\srunning\sshould\snot\scause\san\serror.\s(CVS\s1529)
+D 2004-06-04T19:07:54
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -60,7 +60,7 @@ F src/tokenize.c 6676b946fd8825b67ab52140af4fdc57a70bda48
 F src/trigger.c a9927b57c865b6f3df3fb5e40c9824d722660ded
 F src/update.c bd391079138e67d09c9af34528ca4137c29242d1
 F src/util.c 122bc174f6c8c2eb6a9127d9f13c4c74f83b85e4
-F src/vacuum.c d34374a2d6d5b3d36419a7b87e0a15d2bf31fdd3
+F src/vacuum.c 36a19aa877c696c4ec8b78300c19f4059d2617a7
 F src/vdbe.c 0853ab9983b7adbba8c012bb8b152d8453bf8a97
 F src/vdbe.h ac987945e4dd6f987bca534c6005899f089fc270
 F src/vdbeInt.h b40ff02ce39fd076e6ff3369e19c1bbfe1986682
@@ -188,7 +188,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P c4bd99b79c66217140781309ed06e1ff3ef4a206
-R c633b9f2c50e2f0204a65c82493f0a7e
+P d596f513c3acfe0d297dc3f5c66f4b0ea2d12a34
+R 80f63e5dec1305d34cea7e6025d86b88
 U drh
-Z bb900cf181dd7b4856d93e8f07ef13c0
+Z 93b220522683595895132abf6d6f2f11
diff --git a/manifest.uuid b/manifest.uuid
index 1e06c2674b..5581d9b82e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d596f513c3acfe0d297dc3f5c66f4b0ea2d12a34
\ No newline at end of file
+1cf94a7c41b56506251a9964f133e179bd06825f
\ No newline at end of file
diff --git a/src/vacuum.c b/src/vacuum.c
index 8699108de4..5781944c7c 100644
--- a/src/vacuum.c
+++ b/src/vacuum.c
@@ -14,7 +14,7 @@
 ** Most of the code in this file may be omitted by defining the
 ** SQLITE_OMIT_VACUUM macro.
 **
-** $Id: vacuum.c,v 1.13.2.1 2004/05/10 20:27:41 drh Exp $
+** $Id: vacuum.c,v 1.13.2.2 2004/06/04 19:07:54 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -321,7 +321,7 @@ end_of_vacuum:
   sqliteFree(sVac.s1.z);
   sqliteFree(sVac.s2.z);
   if( zErrMsg ) sqlite_freemem(zErrMsg);
-  if( rc==SQLITE_ABORT && sVac.rc==SQLITE_OK ) sVac.rc = SQLITE_ERROR;
+  if( rc==SQLITE_ABORT && sVac.rc!=SQLITE_INTERRUPT ) sVac.rc = SQLITE_ERROR;
   return sVac.rc;
 #endif
 }