Fix memsubsys1.test so that it works with TEMP_STORE>=2.

FossilOrigin-Name: 8ad88ee0c1145eb9f92267c31d7d787739718716

diff --git a/manifest b/manifest
index ffdcc7087bcf297151c8e722db850ae29db4051b..54b9aca74224b1b4de8328c88fa384fd456a7ef1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Warning\scleanup\sfrom\sMSVC.
-D 2010-10-04T14:11:55
+C Fix\smemsubsys1.test\sso\sthat\sit\sworks\swith\sTEMP_STORE>=2.
+D 2010-10-04T15:47:31
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -536,7 +536,7 @@ F test/malloc_common.tcl cda732c0d2365a058c2a73778cf6b6da6db54452
 F test/manydb.test b3d3bc4c25657e7f68d157f031eb4db7b3df0d3c
 F test/memdb.test 0825155b2290e900264daaaf0334b6dfe69ea498
 F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
-F test/memsubsys1.test e1f7c4231b89923a67b7c593e544e2eeb86259cd
+F test/memsubsys1.test 4cbec6f202c91504bfc4717bfc2ffd6160316c4c
 F test/memsubsys2.test 72a731225997ad5e8df89fdbeae9224616b6aecc
 F test/minmax.test 722d80816f7e096bf2c04f4111f1a6c1ba65453d
 F test/minmax2.test 33504c01a03bd99226144e4b03f7631a274d66e0
@@ -872,7 +872,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 37ff94cec8a50d42c18f2253541bbcb0a6dfd0c3
-R 72991b4ede8e55d39ffb9e07792fd2bb
-U shaneh
-Z 79d1b17c2284822681a738edba5666f3
+P cde62657d6f410a3d6899cd7b4000d276fe3c813
+R 49126d9c74d0eaed4bcfd4c221e96cd4
+U dan
+Z eda4eb19dd9a732f4cfaa7ac88704061

diff --git a/manifest.uuid b/manifest.uuid
index 6e1d9ea39cd070bab2d237c25a5db616ff1cd29f..6fe70c55846092f4dc5d3f108bf17772771c0c04 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cde62657d6f410a3d6899cd7b4000d276fe3c813
\ No newline at end of file
+8ad88ee0c1145eb9f92267c31d7d787739718716
\ No newline at end of file

diff --git a/test/memsubsys1.test b/test/memsubsys1.test
index e31fb0773ce89c5d4dfc23d9d2fa8b85a896dcfc..c24a8bf95db5ab72a372ae2616dc053b27183d61 100644 (file)
--- a/test/memsubsys1.test
+++ b/test/memsubsys1.test
@@ -98,7 +98,7 @@ build_test_db memsubsys1-2 {PRAGMA page_size=1024}
 #show_memstats
 do_test memsubsys1-2.3 {
   set pg_ovfl [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_OVERFLOW 0] 2]
-} [expr $AUTOVACUUM*1024]
+} [expr ($AUTOVACUUM+$TEMP_STORE>=2)*1024]
 do_test memsubsys1-2.4 {
   set pg_used [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0] 2]
 } 20