Pull over the latest changes from the trunk.

FossilOrigin-Name: e388fe8be878c80ef0bfd1699a7268cdb22cb3c6

diff --cc manifest
index 5c5e7a4ae127e4daa2e4afbd07bd5cc707affdbd,dc0a0e8fea582b013752b54f1d3a0d547060a414..e0f98ad21df1957624cbbb4fcccb60a772d44752
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
  -----BEGIN PGP SIGNED MESSAGE-----
  Hash: SHA1
  
- C Add\san\sinterface\sto\sthe\sSQLITE_STMTSTATUS_AUTOINDEX\sstatus\sinformation\nto\sthe\sTCL\sbindings.\s\sAdd\ssome\ssimple\sautomatic\sindex\stest\scases.
- D 2010-04-07T19:32:00
 -C When\srolling\sback\sa\ssavepoint\sto\sthe\sbeginning\sof\sthe\stransaction,\smake\ssure\nto\sinitialize\sthe\sdatabase\ssize\sin\sthe\sbtree\slayer\scorrectly\seven\sif\sthe\ndatabase\ssize\sfield\sof\sthe\sheader\sis\szeroed.
 -D 2010-04-07T20:29:56
++C Pull\sover\sthe\slatest\schanges\sfrom\sthe\strunk.
++D 2010-04-07T20:32:19
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -175,8 -175,8 +175,8 @@@ F src/sqliteInt.h bd7ff54663bdd5b57e0eb
  F src/sqliteLimit.h 3afab2291762b5d09ae20c18feb8e9fa935a60a6
  F src/status.c 4df6fe7dce2d256130b905847c6c60055882bdbe
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c c00d4ed7b365b61aa80c159e611d5e3fded6ea1c
 -F src/tclsqlite.c 1c7faac8372f1ec72d68b9fcce9d6de00f1b7b86
 -F src/test1.c aa9b1e10e834330e7759afb639420117e2422ded
++F src/tclsqlite.c ebf7a964f8311bc52266cf75afedae98cd743df3
 +F src/test1.c 8b4c246c41e75c3ff033edb2e8c2cf15820861ae
  F src/test2.c b6b43413d495addd039a88b87d65c839f86b18cb
  F src/test3.c 4c21700c73a890a47fc685c1097bfb661346ac94
  F src/test4.c ad03bb987ddedce928f4258c1e7fa4109a73497d
@@@ -189,7 -189,8 +189,8 @@@ F src/test_async.c c1656facbaf43cb2e71b
  F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
  F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de
  F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2
 -F src/test_config.c 5844274bf6cec4af3e6461fb3e2d349082635e81
 +F src/test_config.c 8c408fbffbe8082d1d3dc55044ddfd5580f3c9b9
+ F src/test_demovfs.c a3533803c92e659b80a6c9aaf60852ff0a891c8f
  F src/test_devsym.c de3c9af2bb9a8b1e44525c449e4ec3f88e3d4110
  F src/test_func.c 13b582345fb1185a93e46c53310fae8547dcce20
  F src/test_hexio.c 1237f000ec7a491009b1233f5c626ea71bce1ea2
@@@ -798,14 -798,14 +799,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P a811a47fbe4f757a7ab575ae5a0f65177a3f07c0
- R dbe510a1d9d8d39e89b08673a1789f57
 -P af3b72d94a1b6513f02402af3ada5fb5dd390151
 -R f78c9929d17e46d2aa7049123364c764
++P 1f40441204d9a912b1d6b67ff6ff9e17146c7abd a3540c6acf2bb6bdd44c101b63f17ca85e6b68ed
++R 7f80d010d15aec8e14d8cf92d911e2d4
  U drh
- Z 4e449990f788af388aab3ad158bffbb5
 -Z 4bb39b0a9403860754323008ca41f9d2
++Z e9e2b30ff539b1f1c9a0478a2a8d653a
  -----BEGIN PGP SIGNATURE-----
  Version: GnuPG v1.4.6 (GNU/Linux)
  
- iD8DBQFLvN2zoxKgR168RlERAp2oAJwMcL6AMMRbF4hKmnduZZlExp9waACfbPXK
- RKD8ALvU6iGgErFuUvakXVo=
- =jT+h
 -iD8DBQFLvOtHoxKgR168RlERAr6UAJ9fo0g92PB14exEgBW5OrP0Aot84wCfZZHy
 -n7PVWjhCjUBrl1g3CQG0QF4=
 -=WMyU
++iD8DBQFLvOvWoxKgR168RlERAg1MAJ9jynVuYFCgOw6be3NbgI4qOE4nnQCfUKhm
++r4JK585gjPilvuu1iGgxefA=
++=x2Vr
  -----END PGP SIGNATURE-----

diff --cc manifest.uuid
index f90278ff29331f86cef5c1b18d26f62a9852504c,27988654644afe8d07d2a5b22862ed1ccd5c2c7e..70dd5d311849a267c4c6d1b58ea4853aa01ad28d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1f40441204d9a912b1d6b67ff6ff9e17146c7abd
 -a3540c6acf2bb6bdd44c101b63f17ca85e6b68ed
++e388fe8be878c80ef0bfd1699a7268cdb22cb3c6

diff --cc src/tclsqlite.c
Simple merge