From: drh <drh@noemail.net>
Date: Sun, 25 Sep 2005 01:13:09 +0000 (+0000)
Subject: Make sure the default storage for virtual tables is the disk not memory
X-Git-Tag: version-3.6.10~3423
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abec0bee038e521d5ec8b3b8f51144925c187b0b;p=thirdparty%2Fsqlite.git

Make sure the default storage for virtual tables is the disk not memory
while running conflict.test.  Ticket #1453. (CVS 2737)

FossilOrigin-Name: 6d780ca6cfbea10d29a4a1b5226efb269606e21a
---

diff --git a/manifest b/manifest
index 2710153f78..b90f90873f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.2.7\s(CVS\s2736)
-D 2005-09-24T15:25:02
+C Make\ssure\sthe\sdefault\sstorage\sfor\svirtual\stables\sis\sthe\sdisk\snot\smemory\nwhile\srunning\sconflict.test.\s\sTicket\s#1453.\s(CVS\s2737)
+D 2005-09-25T01:13:09
 F Makefile.in 12784cdce5ffc8dfb707300c34e4f1eb3b8a14f1
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -130,7 +130,7 @@ F test/collate3.test 947a77f5b8227e037a7094d0e338a5504f155cc4
 F test/collate4.test daf498e294dcd596b961d425c3f2dda117e4717e
 F test/collate5.test 8fb4e7e0241839356bd8710f437c32efb47bfff8
 F test/collate6.test 6c9470d1606ee3e564675b229653e320c49ec638
-F test/conflict.test 774e10709f5e9a9a7352dc929b856929ec805e58
+F test/conflict.test bc7b81670abfd6ca51cbcbf46ef23cd52784fafd
 F test/corrupt.test 18c7a995b1af76a8c8600b996257f2c7b7bff083
 F test/corrupt2.test 88342570828f2b8cbbd8369eff3891f5c0bdd5ba
 F test/crash.test 131259005bb5dbe776eba8de99408a493c69c06c
@@ -313,7 +313,7 @@ F www/tclsqlite.tcl ddcf912ea48695603c8ed7efb29f0812ef8d1b49
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 70937d5cfa10eda66d926d378f30f9961a7822bf
-R af00b18d3b228afdf6d336b083e69571
+P bd141a7c12c779d15d81acc8f919c37b9a4aa40b
+R e99cc461c79342942f21bd434383bc4a
 U drh
-Z 9a3b0e42ce1a552d5db88eb833f8f0b1
+Z cbb7f4db27a540e6257d547caeec74b5
diff --git a/manifest.uuid b/manifest.uuid
index 4bf401c461..65225fcf89 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bd141a7c12c779d15d81acc8f919c37b9a4aa40b
\ No newline at end of file
+6d780ca6cfbea10d29a4a1b5226efb269606e21a
\ No newline at end of file
diff --git a/test/conflict.test b/test/conflict.test
index 3726ce0a55..0c89f663e3 100644
--- a/test/conflict.test
+++ b/test/conflict.test
@@ -13,7 +13,7 @@
 # This file implements tests for the conflict resolution extension
 # to SQLite.
 #
-# $Id: conflict.test,v 1.25 2005/09/01 03:07:45 drh Exp $
+# $Id: conflict.test,v 1.26 2005/09/25 01:13:09 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -302,6 +302,7 @@ foreach {i conf1 cmd t0 t1 t2 t3} {
     db close
     sqlite3 db test.db 
     if {$conf1!=""} {set conf1 "ON CONFLICT $conf1"}
+    execsql {pragma temp_store=file}
     set ::sqlite_opentemp_count 0
     set r0 [catch {execsql [subst {
       DROP TABLE t1;