Fix a test script bug uncovered by [a121cd80c5] that was causing shared_err.test...

FossilOrigin-Name: d7b63a4c9fdd2acdb5829224b6189e7f2f6bedb9

diff --git a/manifest b/manifest
index e7a9a9d0e4f441173a6f1acbe399809fc1759c5f..d07a71433fcc4531f4443927b5f65eaebe54a752 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Previous\scheck-in\s[534aab837e]\saccidently\sreverted\ssome\nchanges\sfrom\s[a121cd80c5].\s\sThis\scheck-in\srestores\sthose\schanges.
-D 2010-07-15T18:38:39
+C Fix\sa\stest\sscript\sbug\suncovered\sby\s[a121cd80c5]\sthat\swas\scausing\sshared_err.test\sto\sfail.
+D 2010-07-16T10:39:55
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -514,7 +511,7 @@ F test/mallocH.test 79b65aed612c9b3ed2dcdaa727c85895fd1bfbdb
 F test/mallocI.test a88c2b9627c8506bf4703d8397420043a786cdb6
 F test/mallocJ.test b5d1839da331d96223e5f458856f8ffe1366f62e
 F test/mallocK.test d79968641d1b70d88f6c01bdb9a7eb4a55582cc9
-F test/malloc_common.tcl 55b88520b1b181a6e9bf2afcc75801256bbcecb7
+F test/malloc_common.tcl f4a04b7a733eb114a3da16eb39035cde2c851220
 F test/manydb.test b3d3bc4c25657e7f68d157f031eb4db7b3df0d3c
 F test/memdb.test 0825155b2290e900264daaaf0334b6dfe69ea498
 F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
@@ -839,14 +836,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 534aab837e5a34fd58963ab2b505bfbb9da2e8ee
-R b41651436df288d88ac3cd021d9e3ca1
-U drh
-Z e9a6afbc0260d754bad1bb09a2da2dbb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFMP1W1oxKgR168RlERAmZtAJ0fsQjt99bxA6i8H0GgNaydgviCdQCfUFUF
-ZWJnfl2/IG01YhWvoeq9iXc=
-=jLGJ
------END PGP SIGNATURE-----
+P abff795f38e33d778c8dd494a601bc029237da9e
+R 776af8e304d1d65c5041c3e233547932
+U dan
+Z 5f6c2eda8aae20a98f667879615f6770

diff --git a/manifest.uuid b/manifest.uuid
index 5ec3ce6a5f020c3c6716830f0199afa760836eaa..b5248bf736d90802eceb96a5257861bc2e03c6d4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-abff795f38e33d778c8dd494a601bc029237da9e
\ No newline at end of file
+d7b63a4c9fdd2acdb5829224b6189e7f2f6bedb9
\ No newline at end of file

diff --git a/test/malloc_common.tcl b/test/malloc_common.tcl
index 07e1b2b38cabd53f325f77fcef689a245703ed61..ef5deac6bfd6bb27a867d6123c5ecb61e76350ea 100644 (file)
--- a/test/malloc_common.tcl
+++ b/test/malloc_common.tcl
@@ -421,6 +421,7 @@ proc do_malloc_test {tn args} {
         # with the handle [db].
         # 
         catch {db close} 
+        catch {db2 close} 
         catch {file delete -force test.db}
         catch {file delete -force test.db-journal}
         catch {file delete -force test.db-wal}