Make sure everything is deallocated before calling sqlite3_shutdown().

Ticket #3259. (CVS 5501)

FossilOrigin-Name: 4a6ee88697ddc28e0c7df1954d1526de18191827

diff --git a/manifest b/manifest
index 59b7e637477cb653d93c124bec6c1a504c8655e2..15b41185aaebb4315db7a1b50d7f1b4868809773 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sunused\ssqlite3VdbeMemDynamicify()\sfunction\sfrom\sthe\sVDBE.\s(CVS\s5500)
-D 2008-07-30T13:14:55
+C Make\ssure\severything\sis\sdeallocated\sbefore\scalling\ssqlite3_shutdown().\nTicket\s#3259.\s(CVS\s5501)
+D 2008-07-30T13:15:46
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in bbb62eecc851379aef5a48a1bf8787eb13e6ec06
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -438,7 +438,7 @@ F test/pager2.test c025f91b75fe65e85febda64d9416428b8a5cab5
 F test/pager3.test 2323bf27fd5bd887b580247e5bce500ceee994b4
 F test/pageropt.test 6df72c441db0a037b7ec6990d16311c24fbea77b
 F test/pagesize.test e0a8b3fe80f8b8e808d94a00734c7a18c76c407e
-F test/permutations.test 30f4bcd3937ce8dcfaac68d1070fd94637b50c2d
+F test/permutations.test 39ab873ca79d0afe6b7075f200dc2cec8ecb1db3
 F test/pragma.test 2c675ed9a288094ed62bf55b35fbc749e25670fb
 F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 F test/printf.test 262a5acd3158f788e9bdf7f18d718f3af32ff6ef
@@ -476,9 +476,9 @@ F test/sidedelete.test 736ac1da08b3b1aa62df97fef2fcdb1b660111b9
 F test/soak.test 3c317b3e55e1160731030c8e865d1858fab66fea
 F test/softheap1.test 73ebd6e020d2954d965da2072baba5922fc8fb6a
 F test/sort.test 0e4456e729e5a92a625907c63dcdedfbe72c5dc5
-F test/speed1.test 65baf96b7a03e671220a25dfdac00f22c43220b5
+F test/speed1.test 155493358a9aa96b61e51ba546dc80c7ce501251
 F test/speed1p.explain d841e650a04728b39e6740296b852dccdca9b2cb
-F test/speed1p.test bc1f3c2cbb1142640f9a68bcc458119dc979ad9c
+F test/speed1p.test a656e04f07e6f7ba55d031e8287abdefa48ddbd7
 F test/speed2.test 53177056baf6556dcbdcf032bbdfc41c1aa74ded
 F test/speed3.test e312d7e442a5047d730569fdae2ba99bc94e1a13
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
@@ -614,7 +614,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 02870ed21dae2601a656b2f30c3ca0041e9cb60f
-R 9c89ba082a6d33efced66c7d58c4de39
+P aee63308312bcebb79e15cfdf942ee23694444b0
+R 3465f2c7e121c53fca69b8f5aa86f11d
 U drh
-Z 425dec81d319b292477b88c9ab7da758
+Z dce61b95175b8585a01982cf2130d459

diff --git a/manifest.uuid b/manifest.uuid
index 8ce8fabc3ff4cca40d03f8b25dfd7121f3c08b35..b44a3f00a128051edb3f7e5dfc074e994702850f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-aee63308312bcebb79e15cfdf942ee23694444b0
\ No newline at end of file
+4a6ee88697ddc28e0c7df1954d1526de18191827
\ No newline at end of file

diff --git a/test/permutations.test b/test/permutations.test
index 735eaa6663876847336a8a4093416f323fdc4824..738ab44ae19e5c433be816742dde798ee9ff5901 100644 (file)
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: permutations.test,v 1.17 2008/07/25 08:49:01 danielk1977 Exp $
+# $Id: permutations.test,v 1.18 2008/07/30 13:15:46 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -141,6 +141,7 @@ proc run_tests {name args} {
 run_tests "memsubsys1" -description {
   Tests using pre-allocated page and scratch blocks
 } -initialize {
+  catch {db close}
   sqlite3_shutdown
   sqlite3_config_pagecache 4096 24
   sqlite3_config_scratch 25000 1
@@ -159,6 +160,7 @@ run_tests "memsubsys1" -description {
 run_tests "memsubsys2" -description {
   Tests using small pre-allocated page and scratch blocks
 } -initialize {
+  catch {db close}
   sqlite3_shutdown
   sqlite3_config_pagecache 512 5
   sqlite3_config_scratch 1000 1

diff --git a/test/speed1.test b/test/speed1.test
index 5fab54f3652d7c6d1197322fc77dc6ffe9eaed06..8fec7597185764b06ed1f4c814d5de7faa5bd9ae 100644 (file)
--- a/test/speed1.test
+++ b/test/speed1.test
@@ -11,13 +11,13 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is measuring executing speed.
 #
-# $Id: speed1.test,v 1.8 2008/07/29 14:29:07 drh Exp $
+# $Id: speed1.test,v 1.9 2008/07/30 13:15:46 drh Exp $
 #
 
 sqlite3_shutdown
-sqlite3_config_scratch 29000 1
+#sqlite3_config_scratch 29000 1
 sqlite3_config_lookaside 1000 300
-sqlite3_config_pagecache 1024 10000
+#sqlite3_config_pagecache 1024 10000
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 speed_trial_init speed1

diff --git a/test/speed1p.test b/test/speed1p.test
index eb968d44001c3643f86c24dfbd391d31d15f0588..4e14fc93944aa330c70b1b0f0286bf11d80f109b 100644 (file)
--- a/test/speed1p.test
+++ b/test/speed1p.test
@@ -13,13 +13,13 @@
 #
 # This is a copy of speed1.test modified to user prepared statements.
 #
-# $Id: speed1p.test,v 1.4 2008/07/29 14:29:07 drh Exp $
+# $Id: speed1p.test,v 1.5 2008/07/30 13:15:46 drh Exp $
 #
 
 sqlite3_shutdown
-sqlite3_config_scratch 29000 1
+#sqlite3_config_scratch 29000 1
 sqlite3_config_lookaside 2048 300
-sqlite3_config_pagecache 1024 11000
+#sqlite3_config_pagecache 1024 11000
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 speed_trial_init speed1