From: drh <drh@noemail.net>
Date: Sat, 20 Nov 2004 19:01:44 +0000 (+0000)
Subject: Preserve the default_temp_store pragma across VACUUM in version 2.8.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a5b729aa765590985d494fd8b92e65f52ba9cb1;p=thirdparty%2Fsqlite.git

Preserve the default_temp_store pragma across VACUUM in version 2.8.
(Version 3.0 already does this.)  Ticket #1008. (CVS 2120)

FossilOrigin-Name: 7fa623f24a6c566cb149cfb6515faf489280db97
---

diff --git a/manifest b/manifest
index 82cc6bc300..14229c7d0e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\strigger\stests\sthat\suse\sATTACH\sin\sversion\s2.8\swhen\sthere\sis\sa\ncodec\senabled.\s(CVS\s2042)
-D 2004-11-02T18:30:44
+C Preserve\sthe\sdefault_temp_store\spragma\sacross\sVACUUM\sin\sversion\s2.8.\n(Version\s3.0\salready\sdoes\sthis.)\s\sTicket\s#1008.\s(CVS\s2120)
+D 2004-11-20T19:01:45
 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 48f1e99803e924433477a7ccbdab35663acb621d
-F src/vacuum.c 36a19aa877c696c4ec8b78300c19f4059d2617a7
+F src/vacuum.c e6e07446bce87a9250eaaa63cffb90c975b045c0
 F src/vdbe.c f78a26f5bbd647fac84c26e0a54b85361613a004
 F src/vdbe.h ac987945e4dd6f987bca534c6005899f089fc270
 F src/vdbeInt.h b40ff02ce39fd076e6ff3369e19c1bbfe1986682
@@ -191,7 +191,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P e750ae5ab8ed9a2cd38548c63008cc7d2576e26d
-R cbfcc11c67e5bc3861ac7b7938e80e45
+P f77f7753aaca0b4a147f91e538691cb4ee8995a8
+R 9ea9c40f89e38c37ebb1a588019c170f
 U drh
-Z 0c1d91864077f6eee2c42fc7a7772b0e
+Z 9b9122b7bcd276d36fc30ed91b4b70bb
diff --git a/manifest.uuid b/manifest.uuid
index 9854897819..42c235f0d6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f77f7753aaca0b4a147f91e538691cb4ee8995a8
\ No newline at end of file
+7fa623f24a6c566cb149cfb6515faf489280db97
\ No newline at end of file
diff --git a/src/vacuum.c b/src/vacuum.c
index 5781944c7c..c729f8bdf2 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.2 2004/06/04 19:07:54 drh Exp $
+** $Id: vacuum.c,v 1.13.2.3 2004/11/20 19:01:45 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -231,7 +231,7 @@ int sqliteRunVacuum(char **pzErrMsg, sqlite *db){
   static const char *zPragma[] = {
      "default_synchronous",
      "default_cache_size",
-     /* "default_temp_store", */
+     "default_temp_store",
   };
 
   if( db->flags & SQLITE_InTrans ){