Merge all the latest trunk changes into the sessions branch - especially

the SQLITE_ENABLE_STAT3 enhancements.

FossilOrigin-Name: 403431cac6b039b0693915c5422f08dc60dae230

diff --cc main.mk
Simple merge

diff --cc manifest
index 28145296af53114e455a419550e29a5a47204ab2,79c4572a2b4691a50cc3e2ecdaeab9e59845bd66..d7c37981fc1780b96bbe06bdb54989a0c4080a9a
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\sin\sall\strunk\schanges\sthrough\sthe\sversion\s3.7.8\srelease.
- D 2011-09-19T20:28:07.777
 -C Fix\srequirements\smarks\sassociate\swith\sSTAT3.
 -D 2011-10-11T12:39:19.194
++C Merge\sall\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch\s-\sespecially\nthe\sSQLITE_ENABLE_STAT3\senhancements.
++D 2011-10-11T12:58:38.127
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in d314143fa6be24828021d3f583ad37d9afdce505
+ F Makefile.in a162fe39e249b8ed4a65ee947c30152786cfe897
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc b5e917439d5ed42364173d1648aae1d418e323ea
+ F Makefile.msc dcad80fa69f17d46fe6778ba873fc108ca16298d
  F Makefile.vxworks 1deb39c8bb047296c30161ffa10c1b5423e632f9
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
- F VERSION f724de7326e87b7f3b0a55f16ef4b4d993680d54
+ F VERSION bb37c274b503bbe73f00ea4f374eb817cba4b171
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/2005osaward.gif 0d1851b2a7c1c9d0ccce545f3e14bca42d7fd248
@@@ -102,21 -102,9 +102,21 @@@ F ext/rtree/rtree_util.tcl 06aab2ed5b82
  F ext/rtree/sqlite3rtree.h 1af0899c63a688e272d69d8e746f24e76f10a3f0
  F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 +F ext/session/session1.test 502086908e4144dfaccb1baa77bc29d75a9daace
 +F ext/session/session2.test 99ca0da7ddb617d42bafd83adccf99f18ae0384b
 +F ext/session/session3.test a7a9ce59b8d1e49e2cc23d81421ac485be0eea01
 +F ext/session/session4.test a6ed685da7a5293c5d6f99855bcf41dbc352ca84
 +F ext/session/session5.test 8fdfaf9dba28a2f1c6b89b06168bdab1fef2d478
 +F ext/session/session6.test 443789bc2fca12e4f7075cf692c60b8a2bea1a26
 +F ext/session/session8.test 7d35947ad329b8966f095d34f9617a9eff52dc65
 +F ext/session/session_common.tcl 1539d8973b2aea0025c133eb0cc4c89fcef541a5
 +F ext/session/sessionfault.test 891453e96630ee2915081487fc4b7226f0aa252f
 +F ext/session/sqlite3session.c 57d04e1d6a3579e673e61dea29f214fb4e0fc505
 +F ext/session/sqlite3session.h f374c9c4c96e08f67ac418871c29d423245c7673
 +F ext/session/test_session.c ea4dc9b4a1895c8e6bddcbfe3838d7eb57df2d99
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F main.mk ba82d040a497dc525b96103d007da17ce5baad6d
 -F main.mk aa43670ca62ce7a3f4d80a5f8980c9a9ad076903
++F main.mk 57f16530780b158e99c4983debabeb50b2331a57
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -130,21 -118,21 +130,21 @@@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47
  F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
  F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
  F src/alter.c ac80a0f31189f8b4a524ebf661e47e84536ee7f5
- F src/analyze.c a425d62e8fa9ebcb4359ab84ff0c62c6563d2e2a
+ F src/analyze.c 682fd999a01c897a682365a459190758b83de836
  F src/attach.c 12c6957996908edc31c96d7c68d4942c2474405f
  F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
- F src/backup.c 28a4fe55327ff708bfaf9d4326d02686f7a553c3
+ F src/backup.c 4fd4440c8f81339d8eb8e5d2df54b68d79e94f2f
  F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c 77b09c69d4849a90361e6fe5db36d167f20600c0
+ F src/btree.c b53e009bccb4cfcbcde074f586f0c1c6712a0e12
  F src/btree.h f5d775cd6cfc7ac32a2535b70e8d2af48ef5f2ce
  F src/btreeInt.h 67978c014fa4f7cc874032dd3aacadd8db656bc3
- F src/build.c 851e81f26a75abbb98bd99a7c5f10e8670d867bb
+ F src/build.c 119937b0ae1ff4dcec8fdea53771acc95bafca51
  F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
- F src/ctime.c e3132ec65240b2e2f3d50831021eac387f27584d
+ F src/ctime.c 829f3261d3db48e3d87891bc887208734734c2e4
  F src/date.c a3c6842bad7ae632281811de112a8ba63ff08ab3
 -F src/delete.c ff68e5ef23aee08c0ff528f699a19397ed8bbed8
 +F src/delete.c 614d6e012aa5b624e78f3b556243497825de196b
  F src/expr.c f4dcaeb8252c4b16fcdc245660f70ed366bc6cdd
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 9f00ea98f6b360d477b5a78b5b59a1fbde82431c
@@@ -153,7 -141,7 +153,7 @@@ F src/global.c e230227de13601714b29f936
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 1f1688a9da8b8e27114ba1909a6e74100791139b
 -F src/insert.c ca18783512323f74aaf4ee74b46ffd75ec80d031
++F src/insert.c 25b1bdb27db651ccc9cef37aa691be65d6be9cda
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
@@@ -192,14 -180,14 +192,14 @@@ F src/random.c cd4a67b3953b88019f8cd4cc
  F src/resolve.c 36368f44569208fa074e61f4dd0b6c4fb60ca2b4
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c d9b7d20b0365f80761846f00ef3638d4b33eeaf2
- F src/shell.c 13fe2aeddc3cc90d6a273831d1f63736d1596f81
- F src/sqlite.h.in 355493ac9492746a0bbd17a4fd40911aa89b5a3a
+ F src/shell.c e8fe1251aee84baa2fb232ce83d938de25aa650f
 -F src/sqlite.h.in 821027573c481e45ba276b078a3ae9ebaeb9bb92
++F src/sqlite.h.in 1d5116f51910cc59187b100557feacd8341b633d
  F src/sqlite3ext.h 1a1a4f784aa9c3b00edd287940197de52487cd93
- F src/sqliteInt.h 2c05edf4b8155bf4ef0775a9c30e4b57d7527af3
 -F src/sqliteInt.h 2f66bf068131f0e499dd5e0abea3f68cd6b27b2d
++F src/sqliteInt.h 0d9d61edf5be116d34f6f980cb0db70375e152ad
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
- F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
+ F src/status.c 4568e72dfd36b6a5911f93457364deb072e0b03a
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c be0e691e223a907aa032c7b3ed310dc0ff048109
 -F src/tclsqlite.c 20578e66dda94b4d4db3d4478644a4dd9c6084a6
++F src/tclsqlite.c 8adc2f2bc8a155f2a340242df6d82112a629ed7c
  F src/test1.c 0f41b7c67719207a5de24b009e172c4dcf189827
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432
@@@ -213,7 -201,7 +213,7 @@@ F src/test_async.c 0612a752896fad42d55c
  F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
  F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de
  F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2
- F src/test_config.c fc48c199ad4b88c99bf7c727cae407ca53145c3d
 -F src/test_config.c baf4eda361adc7444bd452d352999fea351fe256
++F src/test_config.c b36ab29f3d9ed4453c989717ef99b1f3c52f443e
  F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_func.c cbdec5cededa0761daedde5baf06004a9bf416b5
@@@ -246,17 -234,17 +246,17 @@@ F src/test_wholenumber.c 6129adfbe7c744
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c c819d9f72168a035d545a5bdafe9b085b20df705
  F src/trigger.c 1cfb80e2290ef66ea89cb4e821caae65a02c0d56
 -F src/update.c 74a6cfb34e9732c1e2a86278b229913b4b51eeec
 +F src/update.c 2d67e24d5a44d8b1c0839bf2ee0c391593e852bf
- F src/utf.c c53eb7404b3eb5c1cbb5655c6a7a0e0ce6bd50f0
+ F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
  F src/util.c 06302ffd2b80408d4f6c7af71f7090e0cf8d8ff7
- F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
+ F src/vacuum.c 0c0ba2242355c6048d65e2b333abe0f7c06348fa
 -F src/vdbe.c 60340bfb23f456ea0791cb28262a887363773371
 -F src/vdbe.h f0725ee997db869ecae5bb70a71612aabeca7755
 -F src/vdbeInt.h 693d6ac6810298fc6b4c503cfbe3f99a240f40af
 -F src/vdbeapi.c 11dc47987abacb76ad016dcf5abc0dc422482a98
 -F src/vdbeaux.c b4d509749502554e67ed14268928e4cc038b8efb
 -F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
 +F src/vdbe.c a4d43779fd31b00cc7c6e1717e4b6cfacf499e66
 +F src/vdbe.h 226d4bc726b3597c35be155a4342db290601d67c
 +F src/vdbeInt.h 1400515b37a4863cdda4601abc0f76eca846c9f5
 +F src/vdbeapi.c c969d467817ca90f99f3d3b46d115fbec08aeb4c
- F src/vdbeaux.c 61701754a1528451ddb6e55e9d353e35ea940492
++F src/vdbeaux.c 2339c8c4d88aba3709f810e8aab7731eecae7aed
 +F src/vdbeblob.c 11248c6362389569764682eb0f59ce910f3cc381
- F src/vdbemem.c 5e6effb96dd53d233361cbfaa3f0a43b9af689e9
+ F src/vdbemem.c 2fc78b3e0fabcc1eaa23cd79dd2e30e6dcfe1e56
  F src/vdbesort.c 468d43c057063e54da4f1988b38b4f46d60e7790
  F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
  F src/vtab.c 901791a47318c0562cd0c676a2c6ff1bc530e582
@@@ -627,11 -617,11 +629,11 @@@ F test/pager3.test 3856d9c80839be0668ef
  F test/pagerfault.test 452f2cc23e3bfcfa935f4442aec1da4fe1dc0442
  F test/pagerfault2.test 1f79ea40d1133b2683a2f811b00f2399f7ec2401
  F test/pagerfault3.test f16e2efcb5fc9996d1356f7cbc44c998318ae1d7
- F test/pageropt.test 8146bf448cf09e87bb1867c2217b921fb5857806
+ F test/pageropt.test 9191867ed19a2b3db6c42d1b36b6fbc657cd1ab0
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
- F test/pcache2.test bc67c6802989dba05cdf3a4574fd882e238c7ecf
+ F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
 -F test/permutations.test ad17319066a90e2db71823c3ff104795ffc71b31
 +F test/permutations.test 97d576e6384f1779e4428516a48458ce8cf7dfd1
  F test/pragma.test c8108e01da04f16e67e5754e610bc62c1b993f6c
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
@@@ -707,9 -696,9 +709,9 @@@ F test/superlock.test 7b1167925e9d30a5d
  F test/sync.test a34cd43e98b7fb84eabbf38f7ed8f7349b3f3d85
  F test/syscall.test 966addf703faee6a5d509abe6d8885e393e552fd
  F test/sysfault.test c79441d88d23696fbec7b147dba98d42a04f523f
- F test/table.test 50c47f5fe9c112e92723af27cd735e6c92de6f85
+ F test/table.test a59d985ca366e39b17b175f387f9d5db5a18d4e2
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
 -F test/tclsqlite.test 5ebcbb0dccc3fbc1edc3bba84c38e2c2d574c5aa
 +F test/tclsqlite.test d5298750115768bca173da8043ffac2924be21a0
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test 51edd31c65ed1560dd600b1796e8325df96318e2
  F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d
@@@ -975,8 -965,8 +978,8 @@@ F tool/split-sqlite3c.tcl d9be87f1c3402
  F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
  F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
- P 5efb02949dbeabccfe1d848d275529f03f3dfc84 3e0da808d2f5b4d12046e05980ca04578f581177
- R 29a8a873fd8274eaac6f4c279a0f93a3
+ F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 -P e5169f9a5b7e20b8adaf6ebb7868a64e44fd7321
 -R fa1bfea306973bc99ccb0d80c9355cfe
++P 98619a23fd11a5eb319687adfdacc91ff2db896c 9325c1a8c413dfbf0381190d8347f0a446ae5f5b
++R d253d1168c1ea36796b51c0ccbb3736e
  U drh
- Z cf555a868961f047f28c626087f81d1a
 -Z 7aa6c1f7c4e6214ddb2d3b34feac8ca1
++Z eba0cc6baac730dcbeed3fe014c48887

diff --cc manifest.uuid
index 910a546531910fdbf4cef26bfcfdcfe532e687f8,076bf3c8fdcfa03e6326223f18588b500e67875c..9b692d8c7fda01085661f4c93cbde14a87141d74
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 98619a23fd11a5eb319687adfdacc91ff2db896c
 -9325c1a8c413dfbf0381190d8347f0a446ae5f5b
++403431cac6b039b0693915c5422f08dc60dae230

diff --cc src/insert.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/tclsqlite.c
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge