From: drh <drh@noemail.net>
Date: Fri, 20 Jun 2008 00:03:21 +0000 (+0000)
Subject: Patch to memsubsys1.test in order to avoid a segfault in tableapi.test. (CVS 5252)
X-Git-Tag: version-3.6.10~925
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af837586458a107af0e2297030e4a4562adc8795;p=thirdparty%2Fsqlite.git

Patch to memsubsys1.test in order to avoid a segfault in tableapi.test. (CVS 5252)

FossilOrigin-Name: 62411a6e605ec50d8d61233d753cd2ad65c2218d
---

diff --git a/manifest b/manifest
index 77ab1d5edc..528a65dc58 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Unset\sglobal\sTCL\svariables\sin\sthe\sfunc.test\sscript\sprior\sto\suse\sto\savoid\nconflicts\sfrom\sother\sscripts.\s(CVS\s5251)
-D 2008-06-19T18:39:11
+C Patch\sto\smemsubsys1.test\sin\sorder\sto\savoid\sa\ssegfault\sin\stableapi.test.\s(CVS\s5252)
+D 2008-06-20T00:03:22
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in ff6f90048555a0088f6a4b7406bed5e55a7c4eff
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -407,7 +407,7 @@ F test/malloc_common.tcl c3b251237a7a1578c49c4f342fa764c4c8fa613c
 F test/manydb.test 8de36b8d33aab5ef295b11d9e95310aeded31af8
 F test/memdb.test a67bda4ff90a38f2b19f6c7f95aa7289e051d893
 F test/memleak.test d2d2a1ff7105d32dc3fdf691458cf6cba58c7217
-F test/memsubsys1.test e3178f1235eece2e97d725d7ff261b37da6d97e5
+F test/memsubsys1.test 209156a07aaf99d095ef2e3a3a0acd5d55c978f6
 F test/minmax.test 5d56f08a7765dfb5c1fb303333f7444dacb37bef
 F test/minmax2.test 33504c01a03bd99226144e4b03f7631a274d66e0
 F test/minmax3.test 05110398e065875b3d9315892889d3c87fccfe2b
@@ -600,7 +600,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P d22cd2a59f472f4eaf80aa9f55fbff2514ca428d
-R 141cad4775fdd164f9905c54617debf2
+P 9b04e10f6c00c36652444206d1d8868a560eb56e
+R 1d236634be0294388a5fbf26bd78c134
 U drh
-Z efce33888cd2e10d3d123e87d1e0d2d9
+Z 98968f4980c50e00172f902ce8864e91
diff --git a/manifest.uuid b/manifest.uuid
index d519012ca1..698fac23f6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9b04e10f6c00c36652444206d1d8868a560eb56e
\ No newline at end of file
+62411a6e605ec50d8d61233d753cd2ad65c2218d
\ No newline at end of file
diff --git a/test/memsubsys1.test b/test/memsubsys1.test
index f7db3941cc..e0eefc75bf 100644
--- a/test/memsubsys1.test
+++ b/test/memsubsys1.test
@@ -11,7 +11,7 @@
 #
 # This file contains tests of the memory allocation subsystem
 #
-# $Id: memsubsys1.test,v 1.2 2008/06/19 17:54:33 drh Exp $
+# $Id: memsubsys1.test,v 1.3 2008/06/20 00:03:22 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -221,5 +221,10 @@ do_test memsubsys1-7.7 {
   set s_ovfl [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_OVERFLOW 0] 2]
 } 0
 
+db close
+sqlite3_shutdown
+sqlite3_config_pagecache 0 0
+sqlite3_config_scratch 0 0
+sqlite3_initialize
 autoinstall_test_functions
 finish_test