Merge the latest trunk enhancements into the sessions branch.

FossilOrigin-Name: 8baef58170ff851d0c4387a6888f59b487b4f33c

diff --cc main.mk
Simple merge

diff --cc manifest
index d7c37981fc1780b96bbe06bdb54989a0c4080a9a,368c393f8f086ceee1ebf47c499b3c6ad8cbc942..5d9bf35a37b34514f137e4e591321b7d5887180a
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- 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
 -C Remove\sstale\srequirements\smarks\sfrom\sthe\squery\splanner.
 -D 2011-10-21T16:47:31.558
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\ssessions\sbranch.
++D 2011-10-21T17:08:23.879
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in a162fe39e249b8ed4a65ee947c30152786cfe897
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -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 57f16530780b158e99c4983debabeb50b2331a57
 -F main.mk ac48970ca7506c9034f5c7b2212111fbeb0a1aaa
++F main.mk 0f09cc961194da519af6bdd3004bb3ec9ebddc80
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -143,22 -131,22 +143,22 @@@ F src/build.c ae152efb9c2d6615b14adb7a5
  F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 829f3261d3db48e3d87891bc887208734734c2e4
- F src/date.c a3c6842bad7ae632281811de112a8ba63ff08ab3
+ F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
 -F src/delete.c ff68e5ef23aee08c0ff528f699a19397ed8bbed8
 +F src/delete.c 614d6e012aa5b624e78f3b556243497825de196b
- F src/expr.c f4dcaeb8252c4b16fcdc245660f70ed366bc6cdd
+ F src/expr.c fbf116f90cabc917ae50bba24a73a0b55519a0c8
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 9f00ea98f6b360d477b5a78b5b59a1fbde82431c
- F src/func.c 59bb046d7e3df1ab512ac339ccb0a6f996a17cb7
+ F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
+ F src/func.c 6261ce00aad9c63cd5b4219249b05683979060e9
  F src/global.c e230227de13601714b29f9363028514aada5ae2f
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
 -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
- F src/loadext.c 99a161b27a499fc8ad40745b7b1900a26f0a5f51
- F src/main.c 13b9a1d38084dd4996ad5f759c4b0e1fc1c010c0
+ F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
+ F src/loadext.c d0d2022a5a07274d408820b978b9e549189d314f
 -F src/main.c df06f5229b8046f85dde253dfd7fe35ae9e4902e
++F src/main.c 61e6886a0606b46fc4b38c2d8585ef55afcf9662
  F src/malloc.c 591aedb20ae40813f1045f2ef253438a334775d9
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
@@@ -185,21 -173,21 +185,21 @@@ F src/parse.y 12b7ebd61ea54f0e1b1083ff6
  F src/pcache.c 49e718c095810c6b3334e3a6d89970aceaddefce
  F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
  F src/pcache1.c 24f5e85a78514584b46190260ba7ab0a66312197
- F src/pragma.c 68d7db4fc9de8bcfae94c1d43120531ec252b9c0
+ F src/pragma.c da8ef96b3eec351e81e0061c39810e548bcc96d7
  F src/prepare.c e64261559a3187698a3e7e6c8b001a4f4f98dab4
- F src/printf.c 585a36b6a963df832cfb69505afa3a34ed5ef8a1
+ F src/printf.c 03104cbff6959ff45df69dc9060ba6212f60a869
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c 36368f44569208fa074e61f4dd0b6c4fb60ca2b4
+ F src/resolve.c 365ab1c870e38596d6869e76fb544fe6e4ffc809
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c d9b7d20b0365f80761846f00ef3638d4b33eeaf2
- F src/shell.c e8fe1251aee84baa2fb232ce83d938de25aa650f
- F src/sqlite.h.in 1d5116f51910cc59187b100557feacd8341b633d
+ F src/select.c 80f3ac44a8514b1d107b80f5df4a424ae059d2b6
+ F src/shell.c f0ab793261ab045a0b8c47fa2707e8a894d2898f
 -F src/sqlite.h.in c3d7085eb5f7d3b4ce7a484e0ecb9082e57daab1
++F src/sqlite.h.in 42693f5fc57345ee4bfc9ab4b65a1637c8fd2034
  F src/sqlite3ext.h 1a1a4f784aa9c3b00edd287940197de52487cd93
- F src/sqliteInt.h 0d9d61edf5be116d34f6f980cb0db70375e152ad
 -F src/sqliteInt.h 6f8e592fc28d16160d017684966b3528833a46c1
++F src/sqliteInt.h bdf2d6a2c2908864fd75a242b35ded2cf3a0f395
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 4568e72dfd36b6a5911f93457364deb072e0b03a
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c 8adc2f2bc8a155f2a340242df6d82112a629ed7c
 -F src/tclsqlite.c de581e2e71f5e7f98366156afad83b4742ac6fe0
++F src/tclsqlite.c b9615cb7f32113724f0b9e89dd1b2adc927991ae
  F src/test1.c 0f41b7c67719207a5de24b009e172c4dcf189827
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432
@@@ -246,16 -234,16 +246,16 @@@ 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 2d67e24d5a44d8b1c0839bf2ee0c391593e852bf
 -F src/update.c 25e046a8f69d5e557aabde2000487b8545509d8d
++F src/update.c 7509519281d566553cb2e8561541d49a2c054ed4
  F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
- F src/util.c 06302ffd2b80408d4f6c7af71f7090e0cf8d8ff7
+ F src/util.c df83983bd57057df4951516880066b42b7055269
  F src/vacuum.c 0c0ba2242355c6048d65e2b333abe0f7c06348fa
- F src/vdbe.c a4d43779fd31b00cc7c6e1717e4b6cfacf499e66
 -F src/vdbe.c 251381bff459154bf239e9977bd39b22bcb7a94c
 -F src/vdbe.h f0725ee997db869ecae5bb70a71612aabeca7755
 -F src/vdbeInt.h 693d6ac6810298fc6b4c503cfbe3f99a240f40af
 -F src/vdbeapi.c 11dc47987abacb76ad016dcf5abc0dc422482a98
 -F src/vdbeaux.c 5bd4886b444051b779eb4a2e27e46a5deb65c0fd
 -F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
++F src/vdbe.c 9cccccebf82571837b03e0b7bdc22a2651c368c5
 +F src/vdbe.h 226d4bc726b3597c35be155a4342db290601d67c
 +F src/vdbeInt.h 1400515b37a4863cdda4601abc0f76eca846c9f5
 +F src/vdbeapi.c c969d467817ca90f99f3d3b46d115fbec08aeb4c
- F src/vdbeaux.c 2339c8c4d88aba3709f810e8aab7731eecae7aed
++F src/vdbeaux.c c2e9565d942bf9258155f62ec4c80197d5e449f5
 +F src/vdbeblob.c 11248c6362389569764682eb0f59ce910f3cc381
  F src/vdbemem.c 2fc78b3e0fabcc1eaa23cd79dd2e30e6dcfe1e56
  F src/vdbesort.c 468d43c057063e54da4f1988b38b4f46d60e7790
  F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
@@@ -633,10 -624,10 +636,10 @@@ F test/pageropt.test 9191867ed19a2b3db6
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
- F test/permutations.test 97d576e6384f1779e4428516a48458ce8cf7dfd1
- F test/pragma.test c8108e01da04f16e67e5754e610bc62c1b993f6c
 -F test/permutations.test 522823b47238cb1754198f80817fe9f9158ede55
++F test/permutations.test 6f650848f527507771eb8a447d5969a8d14e2040
+ F test/pragma.test 1ea0c85be853135bb7468e6eed48ee12b04794d4
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
- F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
+ F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
  F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc
  F test/quick.test 1681febc928d686362d50057c642f77a02c62e57
@@@ -975,11 -966,13 +979,13 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
- F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
+ F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d
+ F tool/symbols.sh fec58532668296d7c7dc48be9c87f75ccdb5814f
  F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
+ F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 98619a23fd11a5eb319687adfdacc91ff2db896c 9325c1a8c413dfbf0381190d8347f0a446ae5f5b
- R d253d1168c1ea36796b51c0ccbb3736e
 -P 07159e84b40b01fa40cac5fad1f433888e5984f8
 -R 59b3b1fdd8178d0f82d2b752104b93d8
++P 403431cac6b039b0693915c5422f08dc60dae230 76de9914bed11abda3898928633ad09d5a284f84
++R ab14a959a3d450010ae943a82abd757a
  U drh
- Z eba0cc6baac730dcbeed3fe014c48887
 -Z 3d414bcbeacde088fb044f861f268a3d
++Z 7ff2c714c610eb8c2779c328e2695599

diff --cc manifest.uuid
index 9b692d8c7fda01085661f4c93cbde14a87141d74,f4d78eed3e799b665bf61c84b58576fa43ec517c..4409f25c432cc8011f4926fdf21c6fdefe40a40d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 403431cac6b039b0693915c5422f08dc60dae230
 -76de9914bed11abda3898928633ad09d5a284f84
++8baef58170ff851d0c4387a6888f59b487b4f33c

diff --cc src/main.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/update.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc test/permutations.test
Simple merge