diff --git a/manifest b/manifest
index ab9b95b0ad..24b2e09ce9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Detect\sand\shandles\sthe\scase\swhere\sa\srow\sis\smodified\sor\sdeleted\swhile\sit\nis\sbeing\sread\sduring\sSELECT\sprocessing.\s(CVS\s5399)
-D 2008-07-11T21:02:54
+C Remove\sleftover\sdebugging\scommands\s(breakpoint\sand\sbtree_breakpoint)\sfrom\ntest\sscripts.\s(CVS\s5400)
+D 2008-07-12T14:52:20
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a03f7cb4f7ad50bc53a788c6c544430e81f95de4
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -95,9 +95,9 @@ F src/attach.c b18ba42c77f7d3941f5d23d2ca20fa1d841a4e91
 F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627
 F src/bitvec.c 95c86bd18d8fedf0533f5af196192546e10a7e7d
 F src/btmutex.c 483ced3c52205b04b97df69161fadbf87f4f1ea2
-F src/btree.c dcbb9624c99e53cbb1d63e1c980fc9e93a02a06b
+F src/btree.c cda41ffc78e53cd29e53eab47d174d3e6afd680d
 F src/btree.h 03256ed7ee42b5ecacbe887070b0f8249e7d069d
-F src/btreeInt.h 346cef00620c91dd7c632b57defd1332d0847edc
+F src/btreeInt.h a6a5ffab12fa2c15392b85242cd5568371949046
 F src/build.c bac7233d984be3805aaa41cf500f7ee12dc97249
 F src/callback.c aa492a0ad8c2d454edff9fb8a57fae13743cf71d
 F src/complete.c cb14e06dbe79dee031031f0d9e686ff306afe07c
@@ -144,14 +144,14 @@ F src/select.c b909e21358f141627d1cadfdfbdb43ec08ed0a4b
 F src/shell.c 4b835fe734304ac22a3385868cd3790c1e4f7aa1
 F src/sqlite.h.in a573ab3a22256fc6c28b8f27d5af446f2b712a31
 F src/sqlite3ext.h 1e3887c9bd3ae66cb599e922824b04cd0d0f2c3e
-F src/sqliteInt.h 83181862609629e04b99ae8087b46a7c9dcde7af
+F src/sqliteInt.h aebce6d82210334fe00e6d5fa4bb6768cf02f184
 F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
 F src/status.c 2076bc996618b1a112a797f05c1d62026ae01402
 F src/table.c 22744786199c9195720c15a7a42cb97b2e2728d8
 F src/tclsqlite.c ec46084184f033ba396a9ee7b5514b695083d0f3
-F src/test1.c 30bdb22f911efd492c4f49565eae014330231ece
-F src/test2.c c46d146019ab6e37474e66b3c789e5237d9ea7b7
-F src/test3.c 3e9efdcac31466ccd1723fb074d65a4876d2f70f
+F src/test1.c 346e9262793be825ebadd9e69600d1b4682650f1
+F src/test2.c 7a634c1e044be3ea5845e65155fdd1cab13936cb
+F src/test3.c e00795839be38f0345a4845170426fb17d828bf9
 F src/test4.c ff4ecde3cafc71337b04e8cb7da5bb88e85d70e7
 F src/test5.c 3a6a5717a149d7ca2e6d14f5be72cf7555d54dc4
 F src/test6.c 0a0304a69cfa4962a429d084c6d451ff9e4fb572
@@ -190,7 +190,7 @@ F src/vdbeblob.c a20fe9345062b1a1b4cc187dc5fad45c9414033b
 F src/vdbefifo.c c46dae1194e4277bf007144d7e5b0c0b1c24f136
 F src/vdbemem.c 0c72b58ffd759676ce4829f42bacb83842a58c21
 F src/vtab.c 2096c03ec5540a43c8c73a8f43407dfd3549a982
-F src/where.c 087bfd37580cd1b289f534d5727630b247b00ba3
+F src/where.c e4c40d224cc6931bece3a33b35bd6b6a8deade3f
 F tclinstaller.tcl 4356d9d94d2b5ed5e68f9f0c80c4df3048dd7617
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/all.test ed6849e7a425620d5d4388409f3b15901b5bc2e7
@@ -202,7 +202,7 @@ F test/analyze.test 0bc15f67015ec7fddbae12081a25d82747967c1f
 F test/async.test aecaa46ed0618a3c338f3651ca4f10fbb4021044
 F test/async2.test 8998e089b0fbb3d84cdd51c25a78833486d721af
 F test/async3.test 9ffa0977a78cc6351862a1583be2b1eecd41736d
-F test/attach.test 4ab582932e3c815689f61afcdb9bce245f0bac53
+F test/attach.test 75a5d22f88e730967d68f2c9f95e786e3953d8e3
 F test/attach2.test a295d2d7061adcee5884ef4a93c7c96a82765437
 F test/attach3.test 7b92dc8e40c1ebca9732ca6f2d3fefbd46f196df
 F test/attachmalloc.test 56c5e55563dba6d64641ef2f70ce06900df16912
@@ -210,7 +210,7 @@ F test/auth.test 9eb4b6b99eee54c95711c74c4b9694acf4d850ed
 F test/auth2.test ee3ba272e2b975e913afc9b041ee75706e190005
 F test/autoinc.test 42af2c407c4e37d0626f9cda57ed381e94522c9d
 F test/autovacuum.test 4339e66003b9cf813dd667a83aed2dee27c4c36d
-F test/autovacuum_ioerr2.test dc189f323cf0546289b5a9bbda60bcb1fe52bd4b
+F test/autovacuum_ioerr2.test 598b0663074d3673a9c1bc9a16e80971313bafe6
 F test/avtrans.test 1e901d8102706b63534dbd2bdd4d8f16c4082650
 F test/badutf.test d5360fc31f643d37a973ab0d8b4fb85799c3169f
 F test/between.test 16b1776c6323faadb097a52d673e8e3d8be7d070
@@ -231,11 +231,11 @@ F test/cast.test ce8f14fc80f70b30ed984480cc0d8914a459e8f9
 F test/check.test 024ed399600b799160378cf9d9f436bdf5dfd184
 F test/collate1.test e3eaa48c21e150814be1a7b852d2a8af24458d04
 F test/collate2.test 701d9651c5707024fd86a20649af9ea55e2c0eb8
-F test/collate3.test 947a77f5b8227e037a7094d0e338a5504f155cc4
+F test/collate3.test 9ac82f7a3a7e839a245fc341ff1b7803d56cd41a
 F test/collate4.test 4545554388daaa604e5b3def3aa2f7ed6d56e8da
 F test/collate5.test e54df13eb9e1140273680b3153c6e19b39e59888
 F test/collate6.test 8be65a182abaac8011a622131486dafb8076e907
-F test/collate7.test e23677b1fd271505302643a98178952bb65b6f21
+F test/collate7.test fac8db7aac3978466c04ae892cc74dcf2bc031aa
 F test/collate8.test 7ed2461305ac959886a064dc1e3cf15e155a183f
 F test/collate9.test 3adcc799229545940df2f25308dd1ad65869145a
 F test/collateA.test b8218ab90d1fa5c59dcf156efabb1b2599c580d6
@@ -253,9 +253,9 @@ F test/corrupt9.test 2a1bf91834dc6f7adead1a4fabb5887393147dc6
 F test/corruptA.test 99e95620b980161cb3e79f06a884a4bb8ae265ff
 F test/crash.test 1b6ac8410689ff78028887f445062dc897c9ac89
 F test/crash2.test 26d7a4c5520201e5de2c696ea51ab946b59dc0e9
-F test/crash3.test 0b09687ae1a3ccbcefdfaeb4b963e26e36255d76
+F test/crash3.test 776f9363554c029fcce71d9e6600fa0ba6359ce7
 F test/crash4.test 02ff4f15c149ca1e88a5c299b4896c84d9450c3b
-F test/crash5.test c7ddcf7ca83abc19901b977732144234ac72a938
+F test/crash5.test 80a2f7073381837fc082435c97df52a830abcd80
 F test/crash6.test 9c730cf06335003cb1f5cfceddacd044155336e0
 F test/crash7.test e20a7b9ee1d16eaef7c94a4cb7ed2191b4d05970
 F test/crashtest1.c 09c1c7d728ccf4feb9e481671e29dda5669bbcc2
@@ -269,7 +269,7 @@ F test/delete3.test 555e84a00a99230b7d049d477a324a631126a6ab
 F test/descidx1.test a13d443571e045b61b1b2b759df8dcffa092c968
 F test/descidx2.test 1310ed1326cdfed4ea2c55169631579f082d174f
 F test/descidx3.test 3394ad4d089335cac743c36a14129d6d931c316f
-F test/diskfull.test 34ef53e88372c5b5e488ad1581514559a224c2b1
+F test/diskfull.test 0cede7ef9d8f415d9d3944005c76be7589bb5ebb
 F test/distinctagg.test 2b89d1c5220d966a30ba4b40430338669301188b
 F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea
 F test/enc2.test 6d91a5286f59add0cfcbb2d0da913b76f2242398
@@ -339,16 +339,16 @@ F test/fuzz2.test ea38692ce2da99ad79fe0be5eb1a452c1c4d37bb
 F test/fuzz_common.tcl ff4bc2dfc465f6878f8e2d819620914365382731
 F test/fuzz_malloc.test 166b58dfd77cc04f6afeeaef0cfc1087abf134d1
 F test/hook.test e17d4ed2843ba4ef9b234aa63e6f056bf88f9a19
-F test/icu.test e6bfae7f625c88fd14df6f540fe835bdfc1e4329
+F test/icu.test f51d0f4407ff8bb1e872f51a0e8b08fdc5a6897e
 F test/in.test b35fc31caf26647cc4243c3af8ad29e45ed8776f
-F test/in2.test b1f447f4f0f67e9f83ff931e7e2e30873f9ea055
+F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
 F test/in3.test dc62b080ed79898121c61c91118b4d1e111f1438
 F test/incrblob.test 4455fffd08b2f9418a9257e18b135d72273eff3e
 F test/incrblob2.test c82a780356bdf4d0c77f1adf0ea888248904fc07
 F test/incrblob_err.test 50eff975fd19ea7d0f376a4488a17315ec0703fd
 F test/incrvacuum.test 1a2b0bddc76629afeb41e3d8ea3e4563982d16b9
 F test/incrvacuum2.test 46ef65f377e3937cfd1ba66e818309dab46f590d
-F test/incrvacuum_ioerr.test ebc94092ac1545d9ce518a673988aef88197ca4e
+F test/incrvacuum_ioerr.test 57d2f5777ab13fa03b87b262a4ea1bad5cfc0291
 F test/index.test cbf301cdb2da43e4eac636c3400c2439af1834ad
 F test/index2.test ee83c6b5e3173a3d7137140d945d9a5d4fdfb9d6
 F test/index3.test 727d55dceb9a4ec36675057bb5becfc265e28ca6
@@ -360,11 +360,11 @@ F test/insert5.test 509017213328147d3acdfa2c441bfd82362dda41
 F test/interrupt.test 42e7cf98646fd9cb4a3b131a93ed3c50b9e149f1
 F test/intpkey.test 537669fd535f62632ca64828e435b9e54e8d677f
 F test/io.test 833a1746518ec3005aa7792f9bcb8f01923ff544
-F test/ioerr.test 404edbb58143b4581a6f23c2031d40db931d7b90
+F test/ioerr.test b42f249c9181b5864e53fdae38ef75475d71c66f
 F test/ioerr2.test 5598405c48842c6c0187daad9eb49eff2c54f80d
 F test/ioerr3.test d3cec5e1a11ad6d27527d0d38573fbff14c71bdd
 F test/ioerr4.test fc6eddfec2efc2f1ed217b9eae4c1c1d3516ce86
-F test/ioerr5.test f44e30b4780b879bcceb2601aabae40d8a0a0b56
+F test/ioerr5.test fe59ee3e3d45a121bcdb8f462b718076e66b4ca7
 F test/join.test fc6c4e2132c40edb8af5ad5f0f49996825d5950d
 F test/join2.test f2171c265e57ee298a27e57e7051d22962f9f324
 F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0
@@ -383,8 +383,8 @@ F test/lock.test 6825aea0b5885578b1b63a3b178803842c4ee9f1
 F test/lock2.test 018b846f6f3b3b695fad07e317b7988442b556f4
 F test/lock3.test 615111293cf32aa2ed16d01c6611737651c96fb9
 F test/lock4.test 09d97d52cae18fadfe631552af9880dac6b3ae90
-F test/lock5.test 559d77d3015d1fb545b79ee3a7daf3a0e0224033
-F test/main.test 82c222989e02ea09abd58d453828ffd71806b6bf
+F test/lock5.test f4eeb0400cf65c37f733cb3c74401136f8c46acd
+F test/main.test 8d77c161757ef7d96eaff0413daa7120c3b316fe
 F test/malloc.test 69f5bb5a13b24edb1322fc1f42894f9d2f6446b1
 F test/malloc2.test c847c457d37cf37ff9ff989fa6bd1475f714e485
 F test/malloc3.test 094f8195fe8e409bd4da0f1d769f7745faec62c8
@@ -406,11 +406,11 @@ F test/malloc_common.tcl cdcf092a77f3578fa4fd02121e60969cdf382e27
 F test/manydb.test 8de36b8d33aab5ef295b11d9e95310aeded31af8
 F test/memdb.test a67bda4ff90a38f2b19f6c7f95aa7289e051d893
 F test/memleak.test d2d2a1ff7105d32dc3fdf691458cf6cba58c7217
-F test/memsubsys1.test 209156a07aaf99d095ef2e3a3a0acd5d55c978f6
+F test/memsubsys1.test 21f46bc27b00df94459012748c523830f870cd9f
 F test/memsubsys2.test c05b541f9c2a1234a9dc2ff2233b3a9544fa5139
 F test/minmax.test 722d80816f7e096bf2c04f4111f1a6c1ba65453d
 F test/minmax2.test 33504c01a03bd99226144e4b03f7631a274d66e0
-F test/minmax3.test 05110398e065875b3d9315892889d3c87fccfe2b
+F test/minmax3.test 94742aa922153953ce3562702815e4f1f079bdb8
 F test/misc1.test 1b89c02c4a33b49dee4cd1d20d161aaaba719075
 F test/misc2.test 1ee89298de9c16b61454658b24999c403e86afe4
 F test/misc3.test 7212ed8dad01427e9acab9bd3e7e5e2c2e89be9e
@@ -431,40 +431,40 @@ F test/pager3.test 2323bf27fd5bd887b580247e5bce500ceee994b4
 F test/pageropt.test 6df72c441db0a037b7ec6990d16311c24fbea77b
 F test/pagesize.test e0a8b3fe80f8b8e808d94a00734c7a18c76c407e
 F test/permutations.test bf962d39b77fd87555455d16bb1208d32a732c6d
-F test/pragma.test e1984ed47f699a4a817008dab4111be31ee8b935
+F test/pragma.test 2c675ed9a288094ed62bf55b35fbc749e25670fb
 F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 F test/printf.test 262a5acd3158f788e9bdf7f18d718f3af32ff6ef
 F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301 x
-F test/ptrchng.test 83150cb7b513e33cce90fdc68f4b1817551857c0
+F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc
 F test/quick.test 3dba257b9d4e06e1b0199bc1401052f554ab5f14
 F test/quote.test 215897dbe8de1a6f701265836d6601cc6ed103e6
 F test/rdonly.test bd054831f8a3078e765a0657e247182486f0cb47
-F test/reindex.test 38b138abe36bf9a08c791ed44d9f76cd6b97b78b
+F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
 F test/rollback.test 0bd29070ba2f76da939347773fbda53337ebd61c
 F test/rowid.test 1c8fc43c60d273e6ea44dfb992db587f3164312c
-F test/rtree.test a8404a59bbc3a7827db9bfb334790c852f0391b3
+F test/rtree.test b85fd4f0861a40ca366ac195e363be2528dcfadf
 F test/safety.test b69e2b2dd5d52a3f78e216967086884bbc1a09c6
 F test/schema.test a8b000723375fd42c68d310091bdbd744fde647c
 F test/schema2.test 35e1c9696443d6694c8980c411497c2b5190d32e
 F test/select1.test 0c7ed6dbe1c54b45dc850d8a7df8a8462bb3e34e
-F test/select2.test 06a2660de57673e2d076c29c0fd73f961a930f87
+F test/select2.test 272a3d3e35b1d3a0760168ababf555e656357fc4
 F test/select3.test 2ce595f8fb8e2ac10071d3b4e424cadd4634a054
 F test/select4.test 0618c9377013840194b7901e6224d841cd3e7193
 F test/select5.test 5ad14ea338aada2e6394ba98fa9aa40e3e50aec0
-F test/select6.test 399f14b9ba37b768afe5d2cd8c12e4f340a69db8
+F test/select6.test 1131113eb6ae398069a8bc2173eb6c9a2d8ff1cd
 F test/select7.test 7906735805cfbee4dddc0bed4c14e68d7f5f9c5f
 F test/select8.test 391de11bdd52339c30580dabbbbe97e3e9a3c79d
 F test/select9.test b4007b15396cb7ba2615cab31e1973b572e43210
 F test/selectA.test e4501789a1d0fe9d00db15187623fb5b7031357b
-F test/selectB.test 4bc893e4cb0f5f43f924dc13a9b76a8b6d134e31
+F test/selectB.test 59c1caf267b0cab464b6f40846c6163816a95fa9
 F test/server1.test f5b790d4c0498179151ca8a7715a65a7802c859c
-F test/shared.test f1066281aa19517ab8dbe76328afadff76516f67
+F test/shared.test b9f3bbd3ba727c5f1f8c815b7d0199262aacf214
 F test/shared2.test 0ee9de8964d70e451936a48c41cb161d9134ccf4
 F test/shared3.test 987316be601e2349e6a340a6d5f8ed981e507931
 F test/shared_err.test 776ab7196ecda8b07a075e115b0725806991e151
 F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
 F test/sidedelete.test 736ac1da08b3b1aa62df97fef2fcdb1b660111b9
-F test/soak.test 64f9b27fbcdec43335a88c546ce1983e6ba40d7b
+F test/soak.test 3c317b3e55e1160731030c8e865d1858fab66fea
 F test/softheap1.test 73ebd6e020d2954d965da2072baba5922fc8fb6a
 F test/sort.test 0e4456e729e5a92a625907c63dcdedfbe72c5dc5
 F test/speed1.test 22e1b27af0683ed44dcd2f93ed817a9c3e65084a
@@ -472,7 +472,7 @@ F test/speed1p.explain d841e650a04728b39e6740296b852dccdca9b2cb
 F test/speed1p.test 5f79987671f930a8aa651091c2952c1782b0df83
 F test/speed2.test 53177056baf6556dcbdcf032bbdfc41c1aa74ded
 F test/speed3.test e312d7e442a5047d730569fdae2ba99bc94e1a13
-F test/speed4.test 20d8ea20bea3ca09c3ef3b5ec820a17e58e132cb
+F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
 F test/sqllimits1.test bfa4ffaeb287f04f0f082abcb5d7581daaaa9bf3
@@ -481,13 +481,13 @@ F test/subselect.test 974e87f8fc91c5f00dd565316d396a5a6c3106c4
 F test/substr.test 4be572ac017143e59b4058dc75c91a0d0dc6d4e0
 F test/sync.test ded6b39d8d8ca3c0c5518516c6371b3316d3e3a3
 F test/table.test 13b1c2e2fb4727b35ee1fb7641fc469214fd2455
-F test/tableapi.test 892208d49e7be4817a4d3e4f641dbcbbee8cd03c
+F test/tableapi.test a669ae9dd3bc8e7a6f74eff003664801667cf4c2
 F test/tclsqlite.test aa1781808502271feccfd24f9e2c0d2c1d7c496a
 F test/tempdb.test b88ac8a19823cf771d742bf61eef93ef337c06b1
 F test/temptable.test 19b851b9e3e64d91e9867619b2a3f5fffee6e125
 F test/tester.tcl 3a121e1a03b29376057b3dfff429ad4f373cd0c3
-F test/thread001.test 8fbd9559da0bbdc273e00318c7fd66c162020af7
-F test/thread002.test 2c4ad2c386f60f6fe268cd91c769ee35b3c1fd0b
+F test/thread001.test 3fb08080e1fe84d1bb7ec7bbc9e13743a77e5bc5
+F test/thread002.test ed9b800460df01e3cf9428ee11dc4e3f04b9b896
 F test/thread1.test 776c9e459b75ba905193b351926ac4019b049f35
 F test/thread2.test 6d7b30102d600f51b4055ee3a5a19228799049fb
 F test/thread_common.tcl 8a9d7a4500dfdbbd36679c977831b62c130b76b1
@@ -505,13 +505,13 @@ F test/tkt1536.test 83ff7a7b6e248016f8d682d4f7a4ae114070d466
 F test/tkt1537.test e3a14332de9770be8ff14bd15c19a49cbec10808
 F test/tkt1567.test 18023cc3626a365f0118e17b66decedec93b1a6f
 F test/tkt1644.test 80b6a2bb17885f3cf1cb886d97cdad13232bb869
-F test/tkt1667.test ef52c857940755ea5eab24d68f808826e7dcdc94
+F test/tkt1667.test 0985dfcf8608f35e145feb6e7ad4e233f2bcb54b
 F test/tkt1873.test 255a002b9afdcf8b0fa3188984e2c964202340e9
 F test/tkt2141.test f543d96f50d5a5dc0bc744f7db74ea166720ce46
 F test/tkt2192.test d213199a51528feb2a0f80b5ee60d1e2abfd9679
-F test/tkt2213.test 8cf7c446e1fcd0627fffe7fc19046eb24ac7333b
+F test/tkt2213.test a9702175601a57b61aba095a233b001d6f362474
 F test/tkt2251.test 5aab8c7898cd2df2a68fe19289cc29e8f5cf8c82
-F test/tkt2285.test c618085f0c13ec3347e607f83c34ada0721b4bfa
+F test/tkt2285.test cca17be61cf600b397188e77e7143844d2b977e9
 F test/tkt2332.test fc955609b958ca86dfa102832243370a0cc84070
 F test/tkt2339.test 73bd17818924cd2ac442e5fd9916b58565739450
 F test/tkt2391.test ab7a11be7402da8b51a5be603425367aa0684567
@@ -520,19 +520,19 @@ F test/tkt2450.test 77ed94863f2049c1420288ddfea2d41e5e0971d6
 F test/tkt2640.test 6e81ebd7d986ff1e9ed570c4c92ca0aa2b3a5848
 F test/tkt2643.test 3f3ebb743da00d4fed4fcf6daed92a0e18e57813
 F test/tkt2686.test 08f0f584461bc4990376936daa0a9bd3e6e81671
-F test/tkt2767.test 6b02308d553d194f329a469bf5c157fe724738d4
-F test/tkt2817.test 709a2201a5590bf56cb97f6fb168a62282203fd1
+F test/tkt2767.test 2607e36e5577c699221b964e7bbc06dd794dd738
+F test/tkt2817.test 94646b604c7dbae7058782f6582c05e200700aa9
 F test/tkt2820.test 017fdee33aaef7abc092beab6088816f1942304b
 F test/tkt2822.test 8b1526b1e5b0d38a1a993f7828fbb81759093686
-F test/tkt2832.test cd56dc66bb31898b7eb2146baa5bde2eb80f96fe
-F test/tkt2854.test de967898652e71de7e5bc1659e4edabaca4a2f7b
+F test/tkt2832.test 85cf382ff406de9de35534b86bc7227d609140c0
+F test/tkt2854.test a2bc584ac26bcebe174229e7a1ad4e6d43c3d569
 F test/tkt2920.test a8737380e4ae6424e00c0273dc12775704efbebf
-F test/tkt2927.test a473c09eafa83d95579fc2b976f2afc11571ce7e
+F test/tkt2927.test 4f9a9319ceea74a16769618bd3105a690c0d1ba0
 F test/tkt2942.test c5c87d179799ca6d1fbe83c815510b87cd5ec7ce
 F test/tkt3080.test 31a02e87a4c80ed443831c2c5b0e8216ff95ac14
 F test/tkt3093.test fbdbc5b4969244ad11f540759003e361fcaf391f
-F test/tkt3121.test 9da9c57b75c9dbebae70eb19f458bbc616d04280
-F test/tkt3201.test 5b16303169c2262d78586679ae8884337e5fc9a8
+F test/tkt3121.test 536df66a02838c26a12fe98639354ca1290ca68b
+F test/tkt3201.test 607d433ad2c1f6a8cb1af55aaca427f63c83191b
 F test/tokenize.test ce430a7aed48fc98301611429595883fdfcab5d7
 F test/trace.test 951cd0f5f571e7f36bf7bfe04be70f90fb16fb00
 F test/trans.test 2fd24cd7aa0b879d49a224cbd647d698f1e7ac5c
@@ -546,7 +546,7 @@ F test/trigger7.test 194984b3f6f851eb905cd0a7bffac09f36cf1244
 F test/trigger8.test 3a09275aa2214fdff56f731b1e775d8dfee4408a
 F test/trigger9.test b42703c378916d52a5e240ba98b25b155d3927a3
 F test/triggerA.test 8dbf5bffa3190bd513785a24a573a166a885fc1b
-F test/triggerB.test abee76e59736a2d10b726d4d361e1ac2e0ce3309
+F test/triggerB.test 9a4d9d98e2f6c5730841c4b55a6152822f986e02
 F test/types.test 98e7a631bddf0806204358b452b02d0e319318a6
 F test/types2.test 3555aacf8ed8dc883356e59efc314707e6247a84
 F test/types3.test a0f66bf12f80fad89493535474f7a6d16fa58150
@@ -555,26 +555,26 @@ F test/update.test 8bc86fd7ef1a00014f76dc6a6a7c974df4aef172
 F test/utf16align.test 7360e84472095518c56746f76b1f9d4dce99fb4d
 F test/vacuum.test 0bc75ee74ab9c69322d6563aa2287375697e630b
 F test/vacuum2.test d3b9691541fe6ed5c711f547a1c7d70e9760ac6f
-F test/vacuum3.test 6149b24613f487915ca9cedfbb9147d5759714ec
+F test/vacuum3.test 75dee6ffd1baa60308dcad93f2c689126500dcff
 F test/varint.test ab7b110089a08b9926ed7390e7e97bdefeb74102
-F test/veryquick.test fdd8108de66eec378291d9a0e46e30d129eef1ca
+F test/veryquick.test e265401afefa994cdf2fe4b6f286b1e87c2f9b9d
 F test/view.test 5799906511d6c77cfe3516d3d1189224350ef732
 F test/vtab1.test 4421276b9010022d623879531a05a58fefaad771
 F test/vtab2.test 1da49b015582965a8fc386aa23d051a5a622b08e
-F test/vtab3.test f38d6d7d19f08bffdadce4d5b8cba078f8118587
-F test/vtab4.test a9d7104d41a787754a734740d7aa61c807a69f87
-F test/vtab5.test 26bc7a0a52c5c2bcfa849ba327f8a0d4abccdb23
-F test/vtab6.test 8273e2c6e13c6f8d39b66cb7fc2591f4b97a9d44
+F test/vtab3.test baad99fd27217f5d6db10660522e0b7192446de1
+F test/vtab4.test 942f8b8280b3ea8a41dae20e7822d065ca1cb275
+F test/vtab5.test a0a84a89c622f4e2e816ebf39883dc319b4a1024
+F test/vtab6.test a56c947193fb28ddb453d38768cb8acc6f2eed79
 F test/vtab7.test a8c3c3cb3eb60be364991bd714e4927e26c4cd85
 F test/vtab8.test e19fa4a538fcd1bb66c22825fa8f71618fb13583
 F test/vtab9.test ea58d2b95d61955f87226381716b2d0b1d4e4f9b
-F test/vtabA.test 9cb6b1afead6fdd91bbdf1ca65c44ccfd9b10936
+F test/vtabA.test 0dcd4c81ffb56649f47d1b5fb9c5ae807ccf41f7
 F test/vtabB.test 04df5dc531b9f44d9ca65b9c1b79f12b5922a796
 F test/vtabC.test 9f2d9eb84bf65e606d6616f20977c5a32a11f548
 F test/vtab_alter.test 3a299749fee97ca3d53bd55717f536e4a2284856
 F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
 F test/vtab_shared.test c19b2555b807ef2ee014c882cdda5bc8d84fcf48
-F test/where.test 5ff4a1bda6352b73354faf1a97706bbfa0d47dfe
+F test/where.test a2b6b45a9f38a1b2bdc021aecfc677f6d9afde63
 F test/where2.test 7012c0ad022a54430dd22c98288d3f4d6599dbcf
 F test/where3.test 97d3936e6a443b968f1a61cdcc0f673252000e94
 F test/where4.test e9b9e2f2f98f00379e6031db6a6fca29bae782a2
@@ -605,7 +605,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 1041deb6ae03c52ce1fb8170d11913cc0bbf3a6e
-R 14bde473a1bc0347c0884dfdfef2d004
+P c80a5d09935c60a2a50bc262c172a94073355f0d
+R 4ecb2580e4a853826fb4fa1ac5c915ee
 U drh
-Z 356e23cc4752d813c3f7c25ef3dd2a11
+Z 7ad634a4c18eb92cdbc19f19fa25b073
diff --git a/manifest.uuid b/manifest.uuid
index 2b5b8f9624..ed60718977 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c80a5d09935c60a2a50bc262c172a94073355f0d
\ No newline at end of file
+dcb160249fa2d592ad09b8b0052102dc44a93511
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index cf531b9086..e20336a3d1 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -9,7 +9,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** $Id: btree.c,v 1.481 2008/07/11 21:02:54 drh Exp $
+** $Id: btree.c,v 1.482 2008/07/12 14:52:20 drh Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** See the header comment on "btreeInt.h" for additional information.
@@ -27,8 +27,11 @@ static const char zMagicHeader[] = SQLITE_FILE_HEADER;
 ** Set this global variable to 1 to enable tracing using the TRACE
 ** macro.
 */
-#if SQLITE_TEST
+#if 0
 int sqlite3BtreeTrace=0;  /* True to enable tracing */
+# define TRACE(X)  if(sqlite3BtreeTrace){printf X;fflush(stdout);}
+#else
+# define TRACE(X)
 #endif
 
 
diff --git a/src/btreeInt.h b/src/btreeInt.h
index 2fd42358e1..0216b63787 100644
--- a/src/btreeInt.h
+++ b/src/btreeInt.h
@@ -9,7 +9,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** $Id: btreeInt.h,v 1.25 2008/07/11 21:02:54 drh Exp $
+** $Id: btreeInt.h,v 1.26 2008/07/12 14:52:20 drh Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** For a detailed discussion of BTrees, refer to
@@ -481,17 +481,6 @@ struct BtCursor {
 #define CURSOR_REQUIRESEEK       2
 #define CURSOR_FAULT             3
 
-/*
-** The TRACE macro will print high-level status information about the
-** btree operation when the global variable sqlite3BtreeTrace is
-** enabled.
-*/
-#if SQLITE_TEST
-# define TRACE(X)   if( sqlite3BtreeTrace ){ printf X; fflush(stdout); }
-#else
-# define TRACE(X)
-#endif
-
 /* The database page the PENDING_BYTE occupies. This page is never used.
 ** TODO: This macro is very similary to PAGER_MJ_PGNO() in pager.c. They
 ** should possibly be consolidated (presumably in pager.h).
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index acb6ffa729..cd976f14e6 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.741 2008/07/11 16:15:18 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.742 2008/07/12 14:52:20 drh Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -1866,7 +1866,7 @@ char *sqlite3VMPrintf(sqlite3*,const char*, va_list);
   void sqlite3DebugPrintf(const char*, ...);
 #endif
 #if defined(SQLITE_TEST)
-  void *sqlite3TextToPtr(const char*);
+  void *sqlite3TestTextToPtr(const char*);
 #endif
 void sqlite3SetString(char **, sqlite3*, const char*, ...);
 void sqlite3ErrorMsg(Parse*, const char*, ...);
diff --git a/src/test1.c b/src/test1.c
index 7793efdf37..529ed84b45 100644
--- a/src/test1.c
+++ b/src/test1.c
@@ -13,7 +13,7 @@
 ** is not included in the SQLite library.  It is used for automated
 ** testing of the SQLite library.
 **
-** $Id: test1.c,v 1.314 2008/07/08 15:26:50 drh Exp $
+** $Id: test1.c,v 1.315 2008/07/12 14:52:20 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -44,7 +44,7 @@ static int testHexToInt(int h){
     return h - 'A' + 10;
   }
 }
-void *sqlite3TextToPtr(const char *z){
+void *sqlite3TestTextToPtr(const char *z){
   void *p;
   u64 v;
   u32 v2;
@@ -109,7 +109,7 @@ int getDbPointer(Tcl_Interp *interp, const char *zA, sqlite3 **ppDb){
     p = (struct SqliteDb*)cmdInfo.objClientData;
     *ppDb = p->db;
   }else{
-    *ppDb = (sqlite3*)sqlite3TextToPtr(zA);
+    *ppDb = (sqlite3*)sqlite3TestTextToPtr(zA);
   }
   return TCL_OK;
 }
@@ -182,7 +182,7 @@ static int getStmtPointer(
   const char *zArg,  
   sqlite3_stmt **ppStmt
 ){
-  *ppStmt = (sqlite3_stmt*)sqlite3TextToPtr(zArg);
+  *ppStmt = (sqlite3_stmt*)sqlite3TestTextToPtr(zArg);
   return TCL_OK;
 }
 
diff --git a/src/test2.c b/src/test2.c
index ae9f06e3a6..c27a9fdf8e 100644
--- a/src/test2.c
+++ b/src/test2.c
@@ -13,7 +13,7 @@
 ** is not included in the SQLite library.  It is used for automated
 ** testing of the SQLite library.
 **
-** $Id: test2.c,v 1.58 2008/06/07 08:58:22 danielk1977 Exp $
+** $Id: test2.c,v 1.59 2008/07/12 14:52:20 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -110,7 +110,7 @@ static int pager_close(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pPager = sqlite3TextToPtr(argv[1]);
+  pPager = sqlite3TestTextToPtr(argv[1]);
   rc = sqlite3PagerClose(pPager);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -137,7 +137,7 @@ static int pager_rollback(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pPager = sqlite3TextToPtr(argv[1]);
+  pPager = sqlite3TestTextToPtr(argv[1]);
   rc = sqlite3PagerRollback(pPager);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -164,7 +164,7 @@ static int pager_commit(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pPager = sqlite3TextToPtr(argv[1]);
+  pPager = sqlite3TestTextToPtr(argv[1]);
   rc = sqlite3PagerCommitPhaseOne(pPager, 0, 0, 0);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -196,7 +196,7 @@ static int pager_stmt_begin(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pPager = sqlite3TextToPtr(argv[1]);
+  pPager = sqlite3TestTextToPtr(argv[1]);
   rc = sqlite3PagerStmtBegin(pPager);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -223,7 +223,7 @@ static int pager_stmt_rollback(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pPager = sqlite3TextToPtr(argv[1]);
+  pPager = sqlite3TestTextToPtr(argv[1]);
   rc = sqlite3PagerStmtRollback(pPager);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -250,7 +250,7 @@ static int pager_stmt_commit(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pPager = sqlite3TextToPtr(argv[1]);
+  pPager = sqlite3TestTextToPtr(argv[1]);
   rc = sqlite3PagerStmtCommit(pPager);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -277,7 +277,7 @@ static int pager_stats(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pPager = sqlite3TextToPtr(argv[1]);
+  pPager = sqlite3TestTextToPtr(argv[1]);
   a = sqlite3PagerStats(pPager);
   for(i=0; i<9; i++){
     static char *zName[] = {
@@ -311,7 +311,7 @@ static int pager_pagecount(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pPager = sqlite3TextToPtr(argv[1]);
+  pPager = sqlite3TestTextToPtr(argv[1]);
   sqlite3PagerPagecount(pPager, &nPage);
   sqlite3_snprintf(sizeof(zBuf), zBuf, "%d", nPage);
   Tcl_AppendResult(interp, zBuf, 0);
@@ -339,7 +339,7 @@ static int page_get(
        " ID PGNO\"", 0);
     return TCL_ERROR;
   }
-  pPager = sqlite3TextToPtr(argv[1]);
+  pPager = sqlite3TestTextToPtr(argv[1]);
   if( Tcl_GetInt(interp, argv[2], &pgno) ) return TCL_ERROR;
   rc = sqlite3PagerGet(pPager, pgno, &pPage);
   if( rc!=SQLITE_OK ){
@@ -372,7 +372,7 @@ static int page_lookup(
        " ID PGNO\"", 0);
     return TCL_ERROR;
   }
-  pPager = sqlite3TextToPtr(argv[1]);
+  pPager = sqlite3TestTextToPtr(argv[1]);
   if( Tcl_GetInt(interp, argv[2], &pgno) ) return TCL_ERROR;
   pPage = sqlite3PagerLookup(pPager, pgno);
   if( pPage ){
@@ -399,7 +399,7 @@ static int pager_truncate(
        " ID PGNO\"", 0);
     return TCL_ERROR;
   }
-  pPager = sqlite3TextToPtr(argv[1]);
+  pPager = sqlite3TestTextToPtr(argv[1]);
   if( Tcl_GetInt(interp, argv[2], &pgno) ) return TCL_ERROR;
   rc = sqlite3PagerTruncate(pPager, pgno);
   if( rc!=SQLITE_OK ){
@@ -428,7 +428,7 @@ static int page_unref(
        " PAGE\"", 0);
     return TCL_ERROR;
   }
-  pPage = (DbPage *)sqlite3TextToPtr(argv[1]);
+  pPage = (DbPage *)sqlite3TestTextToPtr(argv[1]);
   rc = sqlite3PagerUnref(pPage);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -455,7 +455,7 @@ static int page_read(
        " PAGE\"", 0);
     return TCL_ERROR;
   }
-  pPage = sqlite3TextToPtr(argv[1]);
+  pPage = sqlite3TestTextToPtr(argv[1]);
   memcpy(zBuf, sqlite3PagerGetData(pPage), sizeof(zBuf));
   Tcl_AppendResult(interp, zBuf, 0);
   return TCL_OK;
@@ -479,7 +479,7 @@ static int page_number(
        " PAGE\"", 0);
     return TCL_ERROR;
   }
-  pPage = (DbPage *)sqlite3TextToPtr(argv[1]);
+  pPage = (DbPage *)sqlite3TestTextToPtr(argv[1]);
   sqlite3_snprintf(sizeof(zBuf), zBuf, "%d", sqlite3PagerPagenumber(pPage));
   Tcl_AppendResult(interp, zBuf, 0);
   return TCL_OK;
@@ -504,7 +504,7 @@ static int page_write(
        " PAGE DATA\"", 0);
     return TCL_ERROR;
   }
-  pPage = (DbPage *)sqlite3TextToPtr(argv[1]);
+  pPage = (DbPage *)sqlite3TestTextToPtr(argv[1]);
   rc = sqlite3PagerWrite(pPage);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
diff --git a/src/test3.c b/src/test3.c
index 644557844a..6b06dfcfc0 100644
--- a/src/test3.c
+++ b/src/test3.c
@@ -13,7 +13,7 @@
 ** is not included in the SQLite library.  It is used for automated
 ** testing of the SQLite library.
 **
-** $Id: test3.c,v 1.99 2008/07/10 00:32:42 drh Exp $
+** $Id: test3.c,v 1.100 2008/07/12 14:52:20 drh Exp $
 */
 #include "sqliteInt.h"
 #include "btreeInt.h"
@@ -111,7 +111,7 @@ static int btree_close(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pBt = sqlite3TextToPtr(argv[1]);
+  pBt = sqlite3TestTextToPtr(argv[1]);
   rc = sqlite3BtreeClose(pBt);
   if( rc!=SQLITE_OK ){
     Tcl_AppendResult(interp, errorName(rc), 0);
@@ -146,7 +146,7 @@ static int btree_begin_transaction(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pBt = sqlite3TextToPtr(argv[1]);
+  pBt = sqlite3TestTextToPtr(argv[1]);
   sqlite3BtreeEnter(pBt);
   rc = sqlite3BtreeBeginTrans(pBt, 1);
   sqlite3BtreeLeave(pBt);
@@ -175,7 +175,7 @@ static int btree_rollback(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pBt = sqlite3TextToPtr(argv[1]);
+  pBt = sqlite3TestTextToPtr(argv[1]);
   sqlite3BtreeEnter(pBt);
   rc = sqlite3BtreeRollback(pBt);
   sqlite3BtreeLeave(pBt);
@@ -204,7 +204,7 @@ static int btree_commit(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pBt = sqlite3TextToPtr(argv[1]);
+  pBt = sqlite3TestTextToPtr(argv[1]);
   sqlite3BtreeEnter(pBt);
   rc = sqlite3BtreeCommit(pBt);
   sqlite3BtreeLeave(pBt);
@@ -233,7 +233,7 @@ static int btree_begin_statement(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pBt = sqlite3TextToPtr(argv[1]);
+  pBt = sqlite3TestTextToPtr(argv[1]);
   sqlite3BtreeEnter(pBt);
   rc = sqlite3BtreeBeginStmt(pBt);
   sqlite3BtreeLeave(pBt);
@@ -262,7 +262,7 @@ static int btree_rollback_statement(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pBt = sqlite3TextToPtr(argv[1]);
+  pBt = sqlite3TestTextToPtr(argv[1]);
   sqlite3BtreeEnter(pBt);
   rc = sqlite3BtreeRollbackStmt(pBt);
   sqlite3BtreeLeave(pBt);
@@ -291,7 +291,7 @@ static int btree_commit_statement(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pBt = sqlite3TextToPtr(argv[1]);
+  pBt = sqlite3TestTextToPtr(argv[1]);
   sqlite3BtreeEnter(pBt);
   rc = sqlite3BtreeCommitStmt(pBt);
   sqlite3BtreeLeave(pBt);
@@ -321,7 +321,7 @@ static int btree_create_table(
        " ID FLAGS\"", 0);
     return TCL_ERROR;
   }
-  pBt = sqlite3TextToPtr(argv[1]);
+  pBt = sqlite3TestTextToPtr(argv[1]);
   if( Tcl_GetInt(interp, argv[2], &flags) ) return TCL_ERROR;
   sqlite3BtreeEnter(pBt);
   rc = sqlite3BtreeCreateTable(pBt, &iTable, flags);
@@ -355,7 +355,7 @@ static int btree_drop_table(
        " ID TABLENUM\"", 0);
     return TCL_ERROR;
   }
-  pBt = sqlite3TextToPtr(argv[1]);
+  pBt = sqlite3TestTextToPtr(argv[1]);
   if( Tcl_GetInt(interp, argv[2], &iTable) ) return TCL_ERROR;
   sqlite3BtreeEnter(pBt);
   rc = sqlite3BtreeDropTable(pBt, iTable, &notUsed1);
@@ -386,7 +386,7 @@ static int btree_clear_table(
        " ID TABLENUM\"", 0);
     return TCL_ERROR;
   }
-  pBt = sqlite3TextToPtr(argv[1]);
+  pBt = sqlite3TestTextToPtr(argv[1]);
   if( Tcl_GetInt(interp, argv[2], &iTable) ) return TCL_ERROR;
   sqlite3BtreeEnter(pBt);
   rc = sqlite3BtreeClearTable(pBt, iTable);
@@ -417,7 +417,7 @@ static int btree_get_meta(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pBt = sqlite3TextToPtr(argv[1]);
+  pBt = sqlite3TestTextToPtr(argv[1]);
   for(i=0; i<SQLITE_N_BTREE_META; i++){
     char zBuf[30];
     u32 v;
@@ -457,7 +457,7 @@ static int btree_update_meta(
        " ID METADATA...\" (METADATA is ", zBuf, " integers)", 0);
     return TCL_ERROR;
   }
-  pBt = sqlite3TextToPtr(argv[1]);
+  pBt = sqlite3TestTextToPtr(argv[1]);
   for(i=1; i<SQLITE_N_BTREE_META; i++){
     if( Tcl_GetInt(interp, argv[i+2], &aMeta[i]) ) return TCL_ERROR;
   }
@@ -493,7 +493,7 @@ static int btree_pager_stats(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pBt = sqlite3TextToPtr(argv[1]);
+  pBt = sqlite3TestTextToPtr(argv[1]);
  
   /* Normally in this file, with a b-tree handle opened using the 
   ** [btree_open] command it is safe to call sqlite3BtreeEnter() directly.
@@ -548,7 +548,7 @@ static int btree_integrity_check(
        " ID ROOT ...\"", 0);
     return TCL_ERROR;
   }
-  pBt = sqlite3TextToPtr(argv[1]);
+  pBt = sqlite3TestTextToPtr(argv[1]);
   nRoot = argc-2;
   aRoot = (int*)sqlite3_malloc( sizeof(int)*(argc-2) );
   for(i=0; i<argc-2; i++){
@@ -587,7 +587,7 @@ static int btree_cursor_list(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pBt = sqlite3TextToPtr(argv[1]);
+  pBt = sqlite3TestTextToPtr(argv[1]);
   sqlite3BtreeEnter(pBt);
   sqlite3BtreeCursorList(pBt);
   sqlite3BtreeLeave(pBt);
@@ -617,7 +617,7 @@ static int btree_cursor(
        " ID TABLENUM WRITEABLE\"", 0);
     return TCL_ERROR;
   }
-  pBt = sqlite3TextToPtr(argv[1]);
+  pBt = sqlite3TestTextToPtr(argv[1]);
   if( Tcl_GetInt(interp, argv[2], &iTable) ) return TCL_ERROR;
   if( Tcl_GetBoolean(interp, argv[3], &wrFlag) ) return TCL_ERROR;
   pCur = (BtCursor *)ckalloc(sqlite3BtreeCursorSize());
@@ -655,7 +655,7 @@ static int btree_close_cursor(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pCur = sqlite3TextToPtr(argv[1]);
+  pCur = sqlite3TestTextToPtr(argv[1]);
   pBt = pCur->pBtree;
   sqlite3BtreeEnter(pBt);
   rc = sqlite3BtreeCloseCursor(pCur);
@@ -689,7 +689,7 @@ static int btree_move_to(
        " ID KEY\"", 0);
     return TCL_ERROR;
   }
-  pCur = sqlite3TextToPtr(argv[1]);
+  pCur = sqlite3TestTextToPtr(argv[1]);
   sqlite3BtreeEnter(pCur->pBtree);
   if( sqlite3BtreeFlags(pCur) & BTREE_INTKEY ){
     int iKey;
@@ -732,7 +732,7 @@ static int btree_delete(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pCur = sqlite3TextToPtr(argv[1]);
+  pCur = sqlite3TestTextToPtr(argv[1]);
   sqlite3BtreeEnter(pCur->pBtree);
   rc = sqlite3BtreeDelete(pCur);
   sqlite3BtreeLeave(pCur->pBtree);
@@ -763,7 +763,7 @@ static int btree_insert(
     Tcl_WrongNumArgs(interp, 1, objv, "ID KEY DATA ?NZERO?");
     return TCL_ERROR;
   }
-  pCur = sqlite3TextToPtr(Tcl_GetString(objv[1]));
+  pCur = sqlite3TestTextToPtr(Tcl_GetString(objv[1]));
   if( objc==5 ){
     if( Tcl_GetIntFromObj(interp, objv[4], &nZero) ) return TCL_ERROR;
   }else{
@@ -820,7 +820,7 @@ static int btree_next(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pCur = sqlite3TextToPtr(argv[1]);
+  pCur = sqlite3TestTextToPtr(argv[1]);
   sqlite3BtreeEnter(pCur->pBtree);
   rc = sqlite3BtreeNext(pCur, &res);
   sqlite3BtreeLeave(pCur->pBtree);
@@ -856,7 +856,7 @@ static int btree_prev(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pCur = sqlite3TextToPtr(argv[1]);
+  pCur = sqlite3TestTextToPtr(argv[1]);
   sqlite3BtreeEnter(pCur->pBtree);
   rc = sqlite3BtreePrevious(pCur, &res);
   sqlite3BtreeLeave(pCur->pBtree);
@@ -891,7 +891,7 @@ static int btree_first(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pCur = sqlite3TextToPtr(argv[1]);
+  pCur = sqlite3TestTextToPtr(argv[1]);
   sqlite3BtreeEnter(pCur->pBtree);
   rc = sqlite3BtreeFirst(pCur, &res);
   sqlite3BtreeLeave(pCur->pBtree);
@@ -926,7 +926,7 @@ static int btree_last(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pCur = sqlite3TextToPtr(argv[1]);
+  pCur = sqlite3TestTextToPtr(argv[1]);
   sqlite3BtreeEnter(pCur->pBtree);
   rc = sqlite3BtreeLast(pCur, &res);
   sqlite3BtreeLeave(pCur->pBtree);
@@ -960,7 +960,7 @@ static int btree_eof(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pCur = sqlite3TextToPtr(argv[1]);
+  pCur = sqlite3TestTextToPtr(argv[1]);
   sqlite3BtreeEnter(pCur->pBtree);
   rc = sqlite3BtreeEof(pCur);
   sqlite3BtreeLeave(pCur->pBtree);
@@ -990,7 +990,7 @@ static int btree_keysize(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pCur = sqlite3TextToPtr(argv[1]);
+  pCur = sqlite3TestTextToPtr(argv[1]);
   sqlite3BtreeEnter(pCur->pBtree);
   sqlite3BtreeKeySize(pCur, (i64*)&n);
   sqlite3BtreeLeave(pCur->pBtree);
@@ -1020,7 +1020,7 @@ static int btree_key(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pCur = sqlite3TextToPtr(argv[1]);
+  pCur = sqlite3TestTextToPtr(argv[1]);
   sqlite3BtreeEnter(pCur->pBtree);
   sqlite3BtreeKeySize(pCur, (i64*)&n);
   if( sqlite3BtreeFlags(pCur) & BTREE_INTKEY ){
@@ -1064,7 +1064,7 @@ static int btree_data(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pCur = sqlite3TextToPtr(argv[1]);
+  pCur = sqlite3TestTextToPtr(argv[1]);
   sqlite3BtreeEnter(pCur->pBtree);
   if( argc==2 ){
     sqlite3BtreeDataSize(pCur, &n);
@@ -1109,7 +1109,7 @@ static int btree_fetch_key(
        " ID AMT\"", 0);
     return TCL_ERROR;
   }
-  pCur = sqlite3TextToPtr(argv[1]);
+  pCur = sqlite3TestTextToPtr(argv[1]);
   if( Tcl_GetInt(interp, argv[2], &n) ) return TCL_ERROR;
   sqlite3BtreeEnter(pCur->pBtree);
   sqlite3BtreeKeySize(pCur, (i64*)&nKey);
@@ -1149,7 +1149,7 @@ static int btree_fetch_data(
        " ID AMT\"", 0);
     return TCL_ERROR;
   }
-  pCur = sqlite3TextToPtr(argv[1]);
+  pCur = sqlite3TestTextToPtr(argv[1]);
   if( Tcl_GetInt(interp, argv[2], &n) ) return TCL_ERROR;
   sqlite3BtreeEnter(pCur->pBtree);
   sqlite3BtreeDataSize(pCur, &nData);
@@ -1186,7 +1186,7 @@ static int btree_payload_size(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pCur = sqlite3TextToPtr(argv[1]);
+  pCur = sqlite3TestTextToPtr(argv[1]);
   sqlite3BtreeEnter(pCur->pBtree);
   if( sqlite3BtreeFlags(pCur) & BTREE_INTKEY ){
     n1 = 0;
@@ -1236,7 +1236,7 @@ static int btree_cursor_info(
        " ID ?UP-CNT?\"", 0);
     return TCL_ERROR;
   }
-  pCur = sqlite3TextToPtr(argv[1]);
+  pCur = sqlite3TestTextToPtr(argv[1]);
   if( argc==3 ){
     if( Tcl_GetInt(interp, argv[2], &up) ) return TCL_ERROR;
   }else{
@@ -1296,8 +1296,8 @@ static int btree_ovfl_info(
                     " BTREE CURSOR", 0);
     return TCL_ERROR;
   }
-  pBt = sqlite3TextToPtr(argv[1]);
-  pCur = sqlite3TextToPtr(argv[2]);
+  pBt = sqlite3TestTextToPtr(argv[1]);
+  pCur = sqlite3TestTextToPtr(argv[2]);
   if( (*(void**)pCur) != (void*)pBt ){
     Tcl_AppendResult(interp, "Cursor ", argv[2], " does not belong to btree ",
        argv[1], 0);
@@ -1501,7 +1501,7 @@ static int btree_set_cache_size(
        " BT NCACHE\"", 0);
     return TCL_ERROR;
   }
-  pBt = sqlite3TextToPtr(argv[1]);
+  pBt = sqlite3TestTextToPtr(argv[1]);
   if( Tcl_GetInt(interp, argv[2], &nCache) ) return TCL_ERROR;
 
   sqlite3_mutex_enter(pBt->db->mutex);
@@ -1532,7 +1532,7 @@ static int btree_ismemdb(
        " ID\"", 0);
     return TCL_ERROR;
   }
-  pBt = sqlite3TextToPtr(argv[1]);
+  pBt = sqlite3TestTextToPtr(argv[1]);
   sqlite3_mutex_enter(pBt->db->mutex);
   sqlite3BtreeEnter(pBt);
   res = sqlite3PagerIsMemdb(sqlite3BtreePager(pBt));
@@ -1547,7 +1547,6 @@ static int btree_ismemdb(
 ** Register commands with the TCL interpreter.
 */
 int Sqlitetest3_Init(Tcl_Interp *interp){
-  extern int sqlite3BtreeTrace;
   static struct {
      char *zName;
      Tcl_CmdProc *xProc;
@@ -1596,8 +1595,6 @@ int Sqlitetest3_Init(Tcl_Interp *interp){
   for(i=0; i<sizeof(aCmd)/sizeof(aCmd[0]); i++){
     Tcl_CreateCommand(interp, aCmd[i].zName, aCmd[i].xProc, 0, 0);
   }
-  Tcl_LinkVar(interp, "btree_trace", (char*)&sqlite3BtreeTrace,
-     TCL_LINK_INT);
 
   /* The btree_insert command is implemented using the tcl 'object'
   ** interface, not the string interface like the other commands in this
diff --git a/src/where.c b/src/where.c
index 1b5a5f7b8f..5971028b58 100644
--- a/src/where.c
+++ b/src/where.c
@@ -16,7 +16,7 @@
 ** so is applicable.  Because this module is responsible for selecting
 ** indices, you might also think of this module as the "query optimizer".
 **
-** $Id: where.c,v 1.316 2008/07/11 16:15:18 drh Exp $
+** $Id: where.c,v 1.317 2008/07/12 14:52:20 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -30,6 +30,8 @@
 */
 #if defined(SQLITE_TEST) || defined(SQLITE_DEBUG)
 int sqlite3WhereTrace = 0;
+#endif
+#if 0
 # define WHERETRACE(X)  if(sqlite3WhereTrace) sqlite3DebugPrintf X
 #else
 # define WHERETRACE(X)
diff --git a/test/attach.test b/test/attach.test
index 3cb0c2db3e..1bddc467c0 100644
--- a/test/attach.test
+++ b/test/attach.test
@@ -12,7 +12,7 @@
 # focus of this script is testing the ATTACH and DETACH commands
 # and related functionality.
 #
-# $Id: attach.test,v 1.48 2008/02/06 14:11:35 drh Exp $
+# $Id: attach.test,v 1.49 2008/07/12 14:52:20 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -28,7 +28,6 @@ for {set i 2} {$i<=15} {incr i} {
   file delete -force test$i.db-journal
 }
 
-set btree_trace 0
 do_test attach-1.1 {
   execsql {
     CREATE TABLE t1(a,b);
@@ -58,7 +57,6 @@ do_test attach-1.4 {
   }
 } {1 x 2 y}
 do_test attach-1.5 {
-btree_breakpoint
   execsql {
     DETACH DATABASE two;
     SELECT * FROM t1;
@@ -408,7 +406,6 @@ do_test attach-3.4 {
 # prevent test2.db from being read by db2.
 do_test attach-3.5 {
   execsql {SELECT * FROM t2}
-btree_breakpoint
   catchsql {
     SELECT * FROM t2;
   } db2;
@@ -477,8 +474,6 @@ do_test attach-3.15 {
   execsql {SELECT * FROM t1}
 } {1 2 3 4}
 
-#set btree_trace 1
-
 # Ticket #323
 do_test attach-4.1 {
   execsql {DETACH db2}
diff --git a/test/autovacuum_ioerr2.test b/test/autovacuum_ioerr2.test
index 3eb549d246..dadb29c0c5 100644
--- a/test/autovacuum_ioerr2.test
+++ b/test/autovacuum_ioerr2.test
@@ -15,7 +15,7 @@
 # The tests in this file use special facilities that are only
 # available in the SQLite test fixture.
 #
-# $Id: autovacuum_ioerr2.test,v 1.6 2007/04/28 15:47:44 danielk1977 Exp $
+# $Id: autovacuum_ioerr2.test,v 1.7 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -130,4 +130,3 @@ do_ioerr_test autovacuum-ioerr2-1 -sqlprep {
 }
 
 finish_test
-
diff --git a/test/collate3.test b/test/collate3.test
index ad52782706..1a26ab865b 100644
--- a/test/collate3.test
+++ b/test/collate3.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is page cache subsystem.
 #
-# $Id: collate3.test,v 1.11 2005/09/08 01:58:43 drh Exp $
+# $Id: collate3.test,v 1.12 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -152,7 +152,6 @@ ifcapable compound {
     }
   } {0 {}}
   do_test collate3-2.13 {
-btree_breakpoint
     catchsql {
       SELECT 10 UNION ALL SELECT 20 ORDER BY 1 COLLATE string_compare;
     }
diff --git a/test/collate7.test b/test/collate7.test
index 0c913e2521..22b67310f6 100644
--- a/test/collate7.test
+++ b/test/collate7.test
@@ -13,7 +13,7 @@
 # focus of this script is the experimental sqlite3_create_collation_v2()
 # API.
 #
-# $Id: collate7.test,v 1.1 2007/05/07 14:58:53 danielk1977 Exp $
+# $Id: collate7.test,v 1.2 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -70,4 +70,3 @@ do_test collate7-2.4 {
 } {1 {no such collation sequence: CASELESS}}
 
 finish_test
-
diff --git a/test/crash3.test b/test/crash3.test
index 5154de62b1..9b7a678474 100644
--- a/test/crash3.test
+++ b/test/crash3.test
@@ -13,7 +13,7 @@
 # databases after crashes when using the special IO modes triggered 
 # by device IOCAP flags.
 #
-# $Id: crash3.test,v 1.3 2007/08/24 11:52:29 danielk1977 Exp $
+# $Id: crash3.test,v 1.4 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -188,4 +188,3 @@ for {set ii 0} {$ii < 10} {incr ii} {
 }
 
 finish_test
-
diff --git a/test/crash5.test b/test/crash5.test
index 0f02fc33a5..e8faa01b17 100644
--- a/test/crash5.test
+++ b/test/crash5.test
@@ -13,7 +13,7 @@
 # This file tests aspects of recovery from a malloc() failure
 # in a CREATE INDEX statement.
 #
-# $Id: crash5.test,v 1.2 2008/01/18 14:17:21 danielk1977 Exp $
+# $Id: crash5.test,v 1.3 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -108,4 +108,3 @@ for {set ii 0} {$ii < 10} {incr ii} {
 
 
 finish_test
-
diff --git a/test/diskfull.test b/test/diskfull.test
index 0983fecde3..a71db91e41 100644
--- a/test/diskfull.test
+++ b/test/diskfull.test
@@ -12,7 +12,7 @@
 # focus of this file is testing for correct handling of disk full
 # errors.
 # 
-# $Id: diskfull.test,v 1.7 2007/08/24 03:51:34 drh Exp $
+# $Id: diskfull.test,v 1.8 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -104,7 +104,7 @@ do_diskfull_test diskfull-2 VACUUM
 #     PRAGMA cache_size;
 #   }
 # } {10}
-# breakpoint
+# 
 # do_diskfull_test diskfull-3.2 {
 #   BEGIN;
 #     INSERT INTO t3 VALUES( randstr(100, 100), randstr(100, 100) );
diff --git a/test/icu.test b/test/icu.test
index 2a247c6c5c..1138b3d252 100644
--- a/test/icu.test
+++ b/test/icu.test
@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: icu.test,v 1.1 2007/05/07 11:53:14 danielk1977 Exp $
+# $Id: icu.test,v 1.2 2008/07/12 14:52:20 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -115,4 +115,3 @@ do_test icu-4.3 {
 } {apricot cherry chokecherry yamot peach plum}
 
 finish_test
-
diff --git a/test/in2.test b/test/in2.test
index 77092bf545..43240824a7 100644
--- a/test/in2.test
+++ b/test/in2.test
@@ -11,7 +11,7 @@
 # This file tests a special case in the b-tree code that can be
 # hit by the "IN" operator (or EXISTS, NOT IN, etc.).
 #
-# $Id: in2.test,v 1.2 2007/05/12 10:41:48 danielk1977 Exp $
+# $Id: in2.test,v 1.3 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -65,4 +65,3 @@ for {set ::ii 3} {$::ii < $::N} {incr ::ii} {
 }
 
 finish_test
-
diff --git a/test/incrvacuum_ioerr.test b/test/incrvacuum_ioerr.test
index 8527756aaa..47027b823b 100644
--- a/test/incrvacuum_ioerr.test
+++ b/test/incrvacuum_ioerr.test
@@ -15,7 +15,7 @@
 # The tests in this file use special facilities that are only
 # available in the SQLite test fixture.
 #
-# $Id: incrvacuum_ioerr.test,v 1.5 2008/05/09 18:03:28 danielk1977 Exp $
+# $Id: incrvacuum_ioerr.test,v 1.6 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -179,4 +179,3 @@ ifcapable shared_cache {
 }
 
 finish_test
-
diff --git a/test/ioerr.test b/test/ioerr.test
index 4785ad2d8c..35743f06ec 100644
--- a/test/ioerr.test
+++ b/test/ioerr.test
@@ -15,7 +15,7 @@
 # The tests in this file use special facilities that are only
 # available in the SQLite test fixture.
 #
-# $Id: ioerr.test,v 1.40 2008/07/09 11:49:48 danielk1977 Exp $
+# $Id: ioerr.test,v 1.41 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -405,4 +405,3 @@ do_ioerr_test ioerr-14 -ckrefcount true -erc 1 -sqlprep {
 }
 
 finish_test
-
diff --git a/test/ioerr5.test b/test/ioerr5.test
index a060368a93..f22e039069 100644
--- a/test/ioerr5.test
+++ b/test/ioerr5.test
@@ -14,7 +14,7 @@
 # incorrectly write dirty pages out to the database (not safe to do
 # once the pager is in error state).
 #
-# $Id: ioerr5.test,v 1.3 2008/05/15 11:08:08 danielk1977 Exp $
+# $Id: ioerr5.test,v 1.4 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -205,4 +205,3 @@ sqlite3_enable_shared_cache $::enable_shared_cache
 sqlite3_soft_heap_limit $::soft_limit
 
 finish_test
-
diff --git a/test/lock5.test b/test/lock5.test
index 61bae9f879..b4187cafc6 100644
--- a/test/lock5.test
+++ b/test/lock5.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is database locks.
 #
-# $Id: lock5.test,v 1.1 2008/06/28 11:23:00 danielk1977 Exp $
+# $Id: lock5.test,v 1.2 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -175,4 +175,3 @@ do_test lock5-flock.X {
 } {}
 
 finish_test
-
diff --git a/test/main.test b/test/main.test
index 6abfc84857..5c851b5227 100644
--- a/test/main.test
+++ b/test/main.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is exercising the code in main.c.
 #
-# $Id: main.test,v 1.28 2008/01/22 23:37:10 drh Exp $
+# $Id: main.test,v 1.29 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -337,7 +337,6 @@ do_test main-3.2.12 {
 do_test main-3.2.13 {
   catchsql {select $(abc)}
 } {1 {unrecognized token: "$"}}
-breakpoint
 do_test main-3.2.14 {
   set hi\u1234x 987
   db eval "select \$hi\u1234x"
diff --git a/test/memsubsys1.test b/test/memsubsys1.test
index e0eefc75bf..572a8b4dfa 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.3 2008/06/20 00:03:22 drh Exp $
+# $Id: memsubsys1.test,v 1.4 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -196,7 +196,6 @@ sqlite3_shutdown
 sqlite3_config_pagecache 4096 24
 sqlite3_config_scratch 25000 1
 sqlite3_initialize
-breakpoint
 build_test_db memsubsys1-7 {
   PRAGMA page_size=4096;
   PRAGMA cache_size=10;
diff --git a/test/minmax3.test b/test/minmax3.test
index 535a4bf850..8e8164ac0b 100644
--- a/test/minmax3.test
+++ b/test/minmax3.test
@@ -8,7 +8,7 @@
 #    May you share freely, never taking more than you give.
 #
 #***********************************************************************
-# $Id: minmax3.test,v 1.4 2008/03/28 19:16:57 danielk1977 Exp $
+# $Id: minmax3.test,v 1.5 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -215,4 +215,3 @@ do_test minmax3-2.8 {
 } {{}}
 
 finish_test
-
diff --git a/test/pragma.test b/test/pragma.test
index 7ce972eb83..2857cfed18 100644
--- a/test/pragma.test
+++ b/test/pragma.test
@@ -12,7 +12,7 @@
 #
 # This file implements tests for the PRAGMA command.
 #
-# $Id: pragma.test,v 1.63 2008/07/08 07:35:52 danielk1977 Exp $
+# $Id: pragma.test,v 1.64 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -962,7 +962,6 @@ do_test pragma-9.14 {
     PRAGMA temp_store;
   }
 } {0}
-breakpoint
 do_test pragma-9.15 {
   catchsql {
     BEGIN EXCLUSIVE;
diff --git a/test/ptrchng.test b/test/ptrchng.test
index 57546ac369..75525f981c 100644
--- a/test/ptrchng.test
+++ b/test/ptrchng.test
@@ -21,7 +21,7 @@
 #     sqlite3_value_bytes()
 #     sqlite3_value_bytes16()
 #
-# $Id: ptrchng.test,v 1.4 2008/02/14 05:44:45 danielk1977 Exp $
+# $Id: ptrchng.test,v 1.5 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -113,7 +113,6 @@ ifcapable utf16 {
     }
   } {0}
   do_test ptrchng-2.16 {
-btree_breakpoint
     execsql {
       SELECT pointer_change(y, 'text16', 'noop', 'text') FROM t1 WHERE x=3
     }
diff --git a/test/reindex.test b/test/reindex.test
index 503d7976f5..9d5ecd9ee2 100644
--- a/test/reindex.test
+++ b/test/reindex.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.
 # This file implements tests for the REINDEX command.
 #
-# $Id: reindex.test,v 1.3 2005/01/27 00:22:04 danielk1977 Exp $
+# $Id: reindex.test,v 1.4 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -169,4 +169,3 @@ do_test reindex-3.99 {
 } {}
 
 finish_test
-
diff --git a/test/rtree.test b/test/rtree.test
index e6337587bb..eb880af1bd 100644
--- a/test/rtree.test
+++ b/test/rtree.test
@@ -6,7 +6,7 @@
 #***********************************************************************
 # This file runs all rtree related tests.
 #
-# $Id: rtree.test,v 1.1 2008/06/23 15:55:52 danielk1977 Exp $
+# $Id: rtree.test,v 1.2 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -38,4 +38,3 @@ set sqlite_open_file_count 0
 rtree_finish_test
 rename finish_test {}
 rename rtree_finish_test finish_test
-
diff --git a/test/select2.test b/test/select2.test
index e44b7f4a4e..3bbfb347f1 100644
--- a/test/select2.test
+++ b/test/select2.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the SELECT statement.
 #
-# $Id: select2.test,v 1.26 2008/04/24 12:38:29 danielk1977 Exp $
+# $Id: select2.test,v 1.27 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -118,7 +118,6 @@ do_test select2-3.2c {
 } {500}
 do_test select2-3.2d {
   set sqlite_search_count 0
-btree_breakpoint
   execsql {SELECT * FROM tbl2 WHERE 1000=f2}
   set sqlite_search_count
 } {3}
diff --git a/test/select6.test b/test/select6.test
index d90414b0bc..7223b5ee1b 100644
--- a/test/select6.test
+++ b/test/select6.test
@@ -12,7 +12,7 @@
 # focus of this file is testing SELECT statements that contain
 # subqueries in their FROM clause.
 #
-# $Id: select6.test,v 1.26 2006/11/30 13:06:00 drh Exp $
+# $Id: select6.test,v 1.27 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -194,7 +194,6 @@ do_test select6-3.6 {
   }
 } {10.5 3.7 14.2}
 do_test select6-3.7 {
-btree_breakpoint
   execsql {
     SELECT a,b,a+b FROM (SELECT avg(x) as 'a', avg(y) as 'b' FROM t1)
     WHERE a<10
diff --git a/test/selectB.test b/test/selectB.test
index 63e7202571..f117e0b314 100644
--- a/test/selectB.test
+++ b/test/selectB.test
@@ -10,7 +10,7 @@
 #***********************************************************************
 # This file implements regression tests for SQLite library. 
 #
-# $Id: selectB.test,v 1.7 2008/07/10 17:59:12 danielk1977 Exp $
+# $Id: selectB.test,v 1.8 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -372,4 +372,3 @@ for {set ii 3} {$ii <= 4} {incr ii} {
 }
 
 finish_test
-
diff --git a/test/shared.test b/test/shared.test
index 656ca50194..61a28c49b5 100644
--- a/test/shared.test
+++ b/test/shared.test
@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: shared.test,v 1.33 2008/07/08 07:35:52 danielk1977 Exp $
+# $Id: shared.test,v 1.34 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -874,7 +874,6 @@ do_test shared-$av.11.7 {
 } {}
 do_test shared-$av.11.8 {
   set res [list]
-  breakpoint
   db2 eval {
     SELECT abc.a as I, abc2.a as II FROM abc, abc2;
   } {
diff --git a/test/soak.test b/test/soak.test
index 089264fc31..0d110cc4c1 100644
--- a/test/soak.test
+++ b/test/soak.test
@@ -11,7 +11,7 @@
 # This file is the driver for the "soak" tests. It is a peer of the
 # quick.test and all.test scripts.
 #
-# $Id: soak.test,v 1.2 2007/05/30 10:36:47 danielk1977 Exp $
+# $Id: soak.test,v 1.3 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -87,4 +87,3 @@ for {set iRun 0} {[clock seconds] < $soak_finishtime && $nErr==0} {incr iRun} {
 }
 
 really_finish_test
-
diff --git a/test/speed4.test b/test/speed4.test
index 6515db89f0..2ccdaf5cd3 100644
--- a/test/speed4.test
+++ b/test/speed4.test
@@ -17,7 +17,7 @@
 #   * sub-selects
 #   * triggers
 #
-# $Id: speed4.test,v 1.1 2007/10/23 10:25:30 danielk1977 Exp $
+# $Id: speed4.test,v 1.2 2008/07/12 14:52:20 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -229,4 +229,3 @@ execsql {COMMIT}
 
 speed_trial_summary speed4
 finish_test
-
diff --git a/test/tableapi.test b/test/tableapi.test
index 854691291a..141b198097 100644
--- a/test/tableapi.test
+++ b/test/tableapi.test
@@ -12,7 +12,7 @@
 # focus of this file is testing the sqlite_exec_printf() and
 # sqlite_get_table_printf() APIs.
 #
-# $Id: tableapi.test,v 1.18 2008/06/21 12:15:04 danielk1977 Exp $
+# $Id: tableapi.test,v 1.19 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -71,7 +71,6 @@ do_test tableapi-2.3.3 {
   } {}
 } {1 {near "invalid": syntax error}}
 do_test tableapi-2.3.4 {
-breakpoint
   sqlite3_get_table_printf $::dbx {
     SELECT * FROM xyz WHERE a>47 ORDER BY a
   } {} 8
diff --git a/test/thread001.test b/test/thread001.test
index a6ad19d05a..8a2cbb5eaf 100644
--- a/test/thread001.test
+++ b/test/thread001.test
@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: thread001.test,v 1.4 2007/09/10 07:35:47 danielk1977 Exp $
+# $Id: thread001.test,v 1.5 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 
@@ -136,4 +136,3 @@ foreach {tn same_db shared_cache} [list \
 }
 
 finish_test
-
diff --git a/test/thread002.test b/test/thread002.test
index 5b84518ea2..c31e3c427f 100644
--- a/test/thread002.test
+++ b/test/thread002.test
@@ -12,7 +12,7 @@
 #   This test attempts to deadlock SQLite in shared-cache mode.
 #     
 #
-# $Id: thread002.test,v 1.2 2007/10/09 08:29:33 danielk1977 Exp $
+# $Id: thread002.test,v 1.3 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 
@@ -107,4 +107,3 @@ for {set ii 0} {$ii < 3} {incr ii} {
 }
 
 finish_test
-
diff --git a/test/tkt1667.test b/test/tkt1667.test
index 31b698c3b2..1dd78cb78f 100644
--- a/test/tkt1667.test
+++ b/test/tkt1667.test
@@ -14,7 +14,7 @@
 # fixed.  
 #
 #
-# $Id: tkt1667.test,v 1.2 2006/06/20 11:01:09 danielk1977 Exp $
+# $Id: tkt1667.test,v 1.3 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -81,5 +81,3 @@ do_test tkt1667-4.1 {
 integrity_check tkt1667-4.2
 
 finish_test
-
-
diff --git a/test/tkt2213.test b/test/tkt2213.test
index 3bd58676be..d5a81ab88c 100644
--- a/test/tkt2213.test
+++ b/test/tkt2213.test
@@ -14,7 +14,7 @@
 # fixed.  
 #
 #
-# $Id: tkt2213.test,v 1.1 2007/02/05 14:21:48 danielk1977 Exp $
+# $Id: tkt2213.test,v 1.2 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -27,4 +27,3 @@ do_test tkt2213-1 {
 } {0 abcd}
 
 finish_test
-
diff --git a/test/tkt2285.test b/test/tkt2285.test
index 55f0b4cc11..f177c22fec 100644
--- a/test/tkt2285.test
+++ b/test/tkt2285.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library. Specifically.
 # it contains tests to verify that ticket #2285 has been fixed.  
 #
-# $Id: tkt2285.test,v 1.1 2007/04/05 05:46:14 danielk1977 Exp $
+# $Id: tkt2285.test,v 1.2 2008/07/12 14:52:20 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -54,4 +54,3 @@ ifcapable tempdb {
 }
 
 finish_test
-
diff --git a/test/tkt2767.test b/test/tkt2767.test
index 18714b8c9d..6d642b41ba 100644
--- a/test/tkt2767.test
+++ b/test/tkt2767.test
@@ -13,7 +13,7 @@
 # Ticket #2767 is for a VDBE stack overflow on BEFORE
 # triggers that run RAISE(IGNORE).
 #
-# $Id: tkt2767.test,v 1.1 2007/11/11 18:36:35 drh Exp $
+# $Id: tkt2767.test,v 1.2 2008/07/12 14:52:21 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -85,4 +85,4 @@ do_test tkt2767-1.4 {
 
 
 
-finish_test
\ No newline at end of file
+finish_test
diff --git a/test/tkt2817.test b/test/tkt2817.test
index aace754ad9..46b7fe3662 100644
--- a/test/tkt2817.test
+++ b/test/tkt2817.test
@@ -12,7 +12,7 @@
 #
 # Specifically, it tests that bug 2817 is fixed.
 #
-# $Id: tkt2817.test,v 1.1 2007/12/02 11:46:35 danielk1977 Exp $
+# $Id: tkt2817.test,v 1.2 2008/07/12 14:52:21 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -70,4 +70,3 @@ sqlite3 db test.db
 integrity_check tkt2817-2.3
 
 finish_test
-
diff --git a/test/tkt2832.test b/test/tkt2832.test
index 8732b93a97..6a98a7b6c0 100644
--- a/test/tkt2832.test
+++ b/test/tkt2832.test
@@ -11,7 +11,7 @@
 #
 # This file is to test that ticket #2832 has been fixed.
 #
-# $Id: tkt2832.test,v 1.3 2007/12/12 18:05:21 danielk1977 Exp $
+# $Id: tkt2832.test,v 1.4 2008/07/12 14:52:21 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -63,4 +63,3 @@ do_test tkt2832-3.2 {
 } {}
 
 finish_test
-
diff --git a/test/tkt2854.test b/test/tkt2854.test
index e3c1a6c986..7bff008e19 100644
--- a/test/tkt2854.test
+++ b/test/tkt2854.test
@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: tkt2854.test,v 1.2 2008/05/20 13:17:28 shane Exp $
+# $Id: tkt2854.test,v 1.3 2008/07/12 14:52:21 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -147,4 +147,3 @@ db3 close
 db4 close
 sqlite3_enable_shared_cache $::enable_shared_cache
 finish_test
-
diff --git a/test/tkt2927.test b/test/tkt2927.test
index 47b974b07d..18fba3920f 100644
--- a/test/tkt2927.test
+++ b/test/tkt2927.test
@@ -11,7 +11,7 @@
 #
 # This file is to test that ticket #2927 is fixed.
 #
-# $Id: tkt2927.test,v 1.2 2008/05/02 02:00:54 drh Exp $
+# $Id: tkt2927.test,v 1.3 2008/07/12 14:52:21 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -40,7 +40,6 @@ do_test tkt2927-2.1 {
   }
 } {1 11 2 22 3 33 4 44 5 55 1 11 2 22 3 33 4 44 5 55}
 do_test tkt2927-2.2 {
-breakpoint
 #set sqlite_addop_trace 1
   db eval {
     SELECT a, b FROM t1
diff --git a/test/tkt3121.test b/test/tkt3121.test
index 5fdd558b7f..2e8fdbb629 100644
--- a/test/tkt3121.test
+++ b/test/tkt3121.test
@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: tkt3121.test,v 1.1 2008/05/16 15:40:40 danielk1977 Exp $
+# $Id: tkt3121.test,v 1.2 2008/07/12 14:52:21 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -48,4 +48,3 @@ do_test vtabD-1.2 {
 } {abcd {A nice description}}
 
 finish_test
-
diff --git a/test/tkt3201.test b/test/tkt3201.test
index 5576834803..446fd32479 100644
--- a/test/tkt3201.test
+++ b/test/tkt3201.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library. 
 # Specifically, it tests that bug #3201 has been fixed.
 #
-# $Id: tkt3201.test,v 1.2 2008/07/04 10:56:08 danielk1977 Exp $
+# $Id: tkt3201.test,v 1.3 2008/07/12 14:52:21 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -72,5 +72,3 @@ do_test tkt3201-7 {
 
 
 finish_test
-
-
diff --git a/test/triggerB.test b/test/triggerB.test
index 5028152d5a..4ba7b53ac0 100644
--- a/test/triggerB.test
+++ b/test/triggerB.test
@@ -35,7 +35,6 @@ do_test triggerB-1.1 {
   }
 } {1 1 0 2 1 0}
 do_test triggerB-1.2 {
-breakpoint
   execsql {
     UPDATE vx SET y = yy;
     SELECT * FROM vx;
diff --git a/test/vacuum3.test b/test/vacuum3.test
index 87a1618c5a..aeeb8ba6d7 100644
--- a/test/vacuum3.test
+++ b/test/vacuum3.test
@@ -12,7 +12,7 @@
 # focus of this file is changing the database page size using a 
 # VACUUM statement.
 #
-# $Id: vacuum3.test,v 1.5 2008/06/03 07:34:09 danielk1977 Exp $
+# $Id: vacuum3.test,v 1.6 2008/07/12 14:52:21 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -55,7 +55,6 @@ foreach {request actual database} [list \
   4096 4096 8192                        \
   1024 1024 2048                        \
 ] {
-if {$I==10} breakpoint
   do_test vacuum3-1.$I.1 {
     execsql " 
       PRAGMA page_size = $request;
@@ -105,7 +104,6 @@ foreach {request actual database} [list \
   4096 4096 8192                        \
   1024 1024 3072                        \
 ] {
-if {$I==10} breakpoint
   do_test vacuum3-2.$I.1 {
     execsql " 
       PRAGMA page_size = $request;
@@ -181,7 +179,6 @@ foreach {request actual} [list \
   4096 4096                    \
   1024 1024                    \
 ] {
-if {$I==10} breakpoint
   do_test vacuum3-3.$I.1 {
     execsql " 
       PRAGMA page_size = $request;
diff --git a/test/veryquick.test b/test/veryquick.test
index 7634f3d2d4..f21234170c 100644
--- a/test/veryquick.test
+++ b/test/veryquick.test
@@ -8,9 +8,8 @@
 # to malloc or IO error simulation. With these tests omitted, the overall
 # run time is reduced by about 75%.
 #
-# $Id: veryquick.test,v 1.8 2008/06/25 17:54:55 danielk1977 Exp $
+# $Id: veryquick.test,v 1.9 2008/07/12 14:52:21 drh Exp $
 
 set testdir [file dirname $argv0]
 set ISVERYQUICK 1
 source $testdir/quick.test
-
diff --git a/test/vtab3.test b/test/vtab3.test
index 2d7c67940c..ebf8369d5d 100644
--- a/test/vtab3.test
+++ b/test/vtab3.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is the authorisation callback and virtual tables.
 #
-# $Id: vtab3.test,v 1.2 2006/06/20 11:01:09 danielk1977 Exp $
+# $Id: vtab3.test,v 1.3 2008/07/12 14:52:21 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -138,5 +138,3 @@ do_test vtab3-1.8.2 {
 } {elephant}
 
 finish_test
-
-
diff --git a/test/vtab4.test b/test/vtab4.test
index a8e3633e3f..07b6e839d7 100644
--- a/test/vtab4.test
+++ b/test/vtab4.test
@@ -16,7 +16,7 @@
 #     xCommit
 #     xRollback
 #
-# $Id: vtab4.test,v 1.2 2006/09/02 22:14:59 drh Exp $
+# $Id: vtab4.test,v 1.3 2008/07/12 14:52:21 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -168,7 +168,6 @@ do_test vtab4-3.2 {
   set echo_module
 } {xBegin echo(treal) xSync echo(treal) xRollback echo(treal)}
 
-breakpoint
 do_test vtab4-3.3 {
   set echo_module [list]
   set echo_module_sync_fail sreal
diff --git a/test/vtab5.test b/test/vtab5.test
index 4fd678c052..7fd7e0e129 100644
--- a/test/vtab5.test
+++ b/test/vtab5.test
@@ -10,7 +10,7 @@
 #***********************************************************************
 # This file implements regression tests for SQLite library.
 #
-# $Id: vtab5.test,v 1.7 2007/06/27 15:53:35 danielk1977 Exp $
+# $Id: vtab5.test,v 1.8 2008/07/12 14:52:21 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -150,4 +150,3 @@ do_test vtab5.4.2 {
 # } {1 {virtual tables may not be altered}}
 
 finish_test
-
diff --git a/test/vtab6.test b/test/vtab6.test
index 02994ff7cb..ed644a1df9 100644
--- a/test/vtab6.test
+++ b/test/vtab6.test
@@ -14,7 +14,7 @@
 # virtual tables. The test cases in this file are copied from the file
 # join.test, and some of the comments still reflect that.
 #
-# $Id: vtab6.test,v 1.3 2008/03/17 09:36:45 danielk1977 Exp $
+# $Id: vtab6.test,v 1.4 2008/07/12 14:52:21 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -157,7 +157,6 @@ do_test vtab6-1.12 {
 } {1 2 3 4 2 3 4 5}
 
 ifcapable subquery {
-breakpoint
   do_test vtab6-1.13 {
     execsql2 {
       SELECT * FROM t1 NATURAL JOIN 
diff --git a/test/vtabA.test b/test/vtabA.test
index bd9e551da0..5eba5b5ffa 100644
--- a/test/vtabA.test
+++ b/test/vtabA.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is 'hidden' virtual table columns.
 #
-# $Id: vtabA.test,v 1.1 2007/06/26 10:38:54 danielk1977 Exp $
+# $Id: vtabA.test,v 1.2 2008/07/12 14:52:21 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -132,4 +132,3 @@ do_test vtabA-2.4 {
 } {{} {whatelse can i test} hidden}
 
 finish_test
-
diff --git a/test/where.test b/test/where.test
index 56a36fdae2..b328364eaa 100644
--- a/test/where.test
+++ b/test/where.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the use of indices in WHERE clases.
 #
-# $Id: where.test,v 1.44 2007/11/29 17:43:28 danielk1977 Exp $
+# $Id: where.test,v 1.45 2008/07/12 14:52:21 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -1085,7 +1085,6 @@ do_test where-14.4 {
     SELECT x.a || '/' || y.a FROM t8 x, t8 y ORDER BY x.a, x.b DESC
   } 
 } {1/1 1/4 4/1 4/4 nosort}
-btree_breakpoint
 do_test where-14.5 {
   cksort {
     SELECT x.a || '/' || y.a FROM t8 x, t8 y ORDER BY x.b, x.a||x.b