Merge all of the latest trunk changes into the sessions branch.

FossilOrigin-Name: a9bcb432f58b96f079a73c456efd4851c582221e

diff --cc manifest
index f2267763ff9b5f2857c9bf8188366a3aa506f42f,bd8f246a59143080ec067c4a6d0129e0c7856fa2..68ee2b1ff1304e689bc66c3b523a9a2777498922
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\sin\sall\schanges\sfound\sin\sthe\sversion\s3.7.9\srelease\scandidate.
- D 2011-10-31T14:34:31.942
 -C Ensure\s8-byte\salignment\sof\sIndex.aiRowEst[]\selements\seven\sif\sthe\ssize\sof\nan\sIndex\sobject\sis\snot\sa\smultiple\sof\s8\sbytes.
 -D 2012-01-05T12:38:02.435
++C Merge\sall\sof\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
++D 2012-01-05T13:02:36.422
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in a162fe39e249b8ed4a65ee947c30152786cfe897
+ F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc dcad80fa69f17d46fe6778ba873fc108ca16298d
  F Makefile.vxworks 1deb39c8bb047296c30161ffa10c1b5423e632f9
@@@ -145,8 -133,8 +145,8 @@@ F src/callback.c 0425c6320730e6d3981acf
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c a9c26822515f81ec21588cbb482ca6724be02e33
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
- F src/delete.c 614d6e012aa5b624e78f3b556243497825de196b
- F src/expr.c fbf116f90cabc917ae50bba24a73a0b55519a0c8
 -F src/delete.c 51d32f0a9c880663e54ce309f52e40c325d5e112
++F src/delete.c c6796c89280de6cbad73089adb4cdd01a4d4a1a7
+ F src/expr.c 537591e95eac74af783e4eb033954fb218cf398e
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
  F src/func.c 6261ce00aad9c63cd5b4219249b05683979060e9
@@@ -154,54 -142,54 +154,54 @@@ F src/global.c 4cfdca5cb0edd33c4d021bae
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 25b1bdb27db651ccc9cef37aa691be65d6be9cda
 -F src/insert.c d7c69718acbb92e10e4b121da7bed13903342962
++F src/insert.c 1c9a9a4d4ed48c540bafe53cb40c8caf9c423ece
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
- F src/loadext.c d0d2022a5a07274d408820b978b9e549189d314f
- F src/main.c 61e6886a0606b46fc4b38c2d8585ef55afcf9662
- F src/malloc.c 591aedb20ae40813f1045f2ef253438a334775d9
+ F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
 -F src/main.c e60abee4a7ca3da31b67745ccf02b8d29f138614
++F src/main.c 11e7d9ea1930f361ff58262752e4241dc371ecd7
+ F src/malloc.c 15afac5e59b6584efe072e9933aefb4230e74f97
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
- F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
+ F src/mem1.c 7998e7003a3047e323c849a26dda004debc04d03
  F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
  F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
  F src/mem5.c c2c63b7067570b00bf33d751c39af24182316f7f
  F src/memjournal.c 0ebce851677a7ac035ba1512a7e65851b34530c6
- F src/mutex.c 6949180803ff05a7d0e2b9334a95b4fb5a00e23f
+ F src/mutex.c d3b66a569368015e0fcb1ac15f81c119f504d3bc
  F src/mutex.h 2a79e0c10c26412546b501ee0f3d92b42decf63e
- F src/mutex_noop.c d5cfbca87168c661a0b118cd8e329a908e453151
+ F src/mutex_noop.c 7682796b7d8d39bf1c138248858efcd10c9e1553
  F src/mutex_os2.c 882d735098c07c8c6a5472b8dd66e19675fe117f
- F src/mutex_unix.c b4f4e923bb8de93ec3f251fadb50855f23df9579
+ F src/mutex_unix.c c3a4e00f96ba068a8dbef34084465979aaf369cc
  F src/mutex_w32.c 5e54f3ba275bcb5d00248b8c23107df2e2f73e33
  F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
- F src/os.c 5d9b02782ed36345348d6fe21d7762ed3a9cfd2a
- F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
+ F src/os.c 519bdf7c608c4848024e1d87934f9305454145f4
+ F src/os.h c7d888830f168a9b681b3aec30789f4ad2445c17
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
- F src/os_unix.c ddda0b1c5ae536669634d7bff31b3f8f4d654866
- F src/os_win.c 49d418916428a59d773f39993db0ecde56ab4c37
- F src/pager.c ad62daa0c21e27ae332b3ceb4f579a2a97046ddc
- F src/pager.h 9f81b08efb06db4ba8be69446e10b005c351373d
- F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
- F src/pcache.c 49e718c095810c6b3334e3a6d89970aceaddefce
- F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
- F src/pcache1.c 24f5e85a78514584b46190260ba7ab0a66312197
- F src/pragma.c da8ef96b3eec351e81e0061c39810e548bcc96d7
- F src/prepare.c e64261559a3187698a3e7e6c8b001a4f4f98dab4
- F src/printf.c 03104cbff6959ff45df69dc9060ba6212f60a869
+ F src/os_unix.c f19ca2ef603e4f6510f3daf206e244476a68413d
+ F src/os_win.c 88b35c8fe7b32c7398ceace727ea01120cb21989
+ F src/pager.c 5b89ab92631a8fc488b87cc663ab064802173fec
+ F src/pager.h 5cd760857707529b403837d813d86b68938d6183
+ F src/parse.y fabb2e7047417d840e6fdb3ef0988a86849a08ba
+ F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
+ F src/pcache.h b1d8775a9bddf44e65edb0d20bfc57a4982f840f
+ F src/pcache1.c e1aaa3bc9bbfd8b0bc391ca731f5f8185467375d
+ F src/pragma.c dd66f21fafe7be40e1a48ad4195764cc191cf583
+ F src/prepare.c ec4989f7f480544bdc4192fe663470d2a2d7d61e
+ F src/printf.c 7ffb4ebb8b341f67e049695ba031da717b3d2699
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c 365ab1c870e38596d6869e76fb544fe6e4ffc809
+ F src/resolve.c 3d3e80a98f203ac6b9329e9621e29eda85ddfd40
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c 80f3ac44a8514b1d107b80f5df4a424ae059d2b6
- F src/shell.c f0ab793261ab045a0b8c47fa2707e8a894d2898f
- F src/sqlite.h.in 4db67e21b8e05df60dedfc34a25ca1acf6002f48
+ F src/select.c a1d075db66a0ea42807353501b62997969e5be79
+ F src/shell.c aa4183d4a5243d8110b1d3d77faa4aea7e9c9c2d
 -F src/sqlite.h.in 02352d9488394a3489b2d153360da58a7c392070
++F src/sqlite.h.in e819002c73cc667717aa0eab4f0584e201c4e102
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h 3772c4ab4a5d04ca99afabdb49278d74f74d2403
 -F src/sqliteInt.h b8fdd9c39c8d7f5c794f4ea917293d9c75b9aff2
++F src/sqliteInt.h 701b38210f369a802853894309af5185b44061b4
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 4568e72dfd36b6a5911f93457364deb072e0b03a
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c b9615cb7f32113724f0b9e89dd1b2adc927991ae
- F src/test1.c 0f41b7c67719207a5de24b009e172c4dcf189827
 -F src/tclsqlite.c bd86070f52ae3f77a2e6b3b065ff03adb9140bfa
++F src/tclsqlite.c 008daf83b287c600c2495845ac46a9d364c1961a
+ F src/test1.c 1b1e514e85ffe7152b02cba38bd0a1ce8cd56113
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
@@@ -214,19 -202,19 +214,19 @@@ 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 7c1ebc097eee4aec81a0fcaef67e64ffb7217f25
 -F src/test_config.c a036a69b550ebc477ab9ca2b37269201f888436e
++F src/test_config.c 576d3d9450fb009ccd8be581eaab7c7e3458cc40
  F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
- F src/test_func.c cbdec5cededa0761daedde5baf06004a9bf416b5
+ F src/test_func.c 6232d722a4ddb193035aa13a03796bf57d6c12fd
  F src/test_fuzzer.c f884f6f32e8513d34248d6e1ac8a32047fead254
  F src/test_hexio.c c4773049603151704a6ab25ac5e936b5109caf5a
- F src/test_init.c 5d624ffd0409d424cf9adbfe1f056b200270077c
+ F src/test_init.c 3cbad7ce525aec925f8fda2192d576d47f0d478a
  F src/test_intarray.c d879bbf8e4ce085ab966d1f3c896a7c8b4f5fc99
  F src/test_intarray.h 489edb9068bb926583445cb02589344961054207
- F src/test_journal.c 03313c693cca72959dcaaf79f8d76f21c01e19ff
+ F src/test_journal.c 2c06e4be6584d51b935dc8b353980a9388de62ef
  F src/test_loadext.c df586c27176e3c2cb2e099c78da67bf14379a56e
  F src/test_malloc.c 8d416f29ad8573f32601f6056c9d2b17472e9ad5
- F src/test_multiplex.c 3fc368022c46fe44ec22c5e1ed727223a54a6a1d
+ F src/test_multiplex.c 2bf2eb36c9eff73c808ba6d19388e2f577438d9e
  F src/test_multiplex.h e99c571bc4968b7a9363b661481f3934bfead61d
  F src/test_mutex.c a6bd7b9cf6e19d989e31392b06ac8d189f0d573e
  F src/test_onefile.c 40cf9e212a377a6511469384a64b01e6e34b2eec
@@@ -241,30 -230,30 +242,30 @@@ F src/test_superlock.c 2b97936ca127d139
  F src/test_syscall.c a992d8c80ea91fbf21fb2dd570db40e77dd7e6ae
  F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
  F src/test_thread.c 35022393dd54d147b998b6b7f7e945b01114d666
- F src/test_vfs.c b0baec983bd6f872715a4b44c8f39104fec333af
- F src/test_vfstrace.c 0b884e06094a746da729119a2cabdc7aa790063d
+ F src/test_vfs.c 07157a0bbfe161cb5e32cad2079abd26cd611c4b
+ F src/test_vfstrace.c 065c7270a614254b2c68fbc7ba8d1fb1d5cbc823
  F src/test_wholenumber.c 6129adfbe7c7444f2e60cc785927f3aa74e12290
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
- F src/tokenize.c c819d9f72168a035d545a5bdafe9b085b20df705
- F src/trigger.c 1cfb80e2290ef66ea89cb4e821caae65a02c0d56
- F src/update.c 7509519281d566553cb2e8561541d49a2c054ed4
+ F src/tokenize.c 1e86210d3976717a19238ea7b047fac481fe8c12
+ F src/trigger.c ee7e178fb9188f44b532cebd449a7c1df90fb684
 -F src/update.c d3076782c887c10e882996550345da9c4c9f9dea
++F src/update.c 89de085a0bf4da448472029d0420a2b1cf1824ee
  F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
- F src/util.c df83983bd57057df4951516880066b42b7055269
+ F src/util.c ad06374bc92b98071f221f00d553daea514f2b60
  F src/vacuum.c 0c0ba2242355c6048d65e2b333abe0f7c06348fa
- F src/vdbe.c f3d112340d6f9b1acae32673df2e27e782453e7c
- F src/vdbe.h 226d4bc726b3597c35be155a4342db290601d67c
- F src/vdbeInt.h 09dacf6f91da9a386b5427d06a4154aa66a8866d
- F src/vdbeapi.c 0dd7815837230957d5547d9f573c25a92bc792ce
- F src/vdbeaux.c 6836b38d0bd607b5ff20796c4c29c07209a935b5
 -F src/vdbe.c d5062ca4c623b92cecbfa005458a9a4b92f162cf
 -F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
 -F src/vdbeInt.h 88e4d5d717946bfed800a6383c53883484f1a35e
 -F src/vdbeapi.c 3662b6a468a2a4605a15dfab313baa6dff81ad91
 -F src/vdbeaux.c eb13a6917ed7455b5b49236fe5cfb3d3c3e4c57b
 -F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
++F src/vdbe.c 3338717cb2ff8ead889109813149d2182484b835
++F src/vdbe.h 87b8ff40de3f55dbcdc33029416862f517c37a2f
++F src/vdbeInt.h 57ca039ec5291566b667932a31ee03e51872caaa
++F src/vdbeapi.c 2fc381f651738feb2495cb001cf2114dea596cc3
++F src/vdbeaux.c ca1eada4b21723a67c510c0f456217c03ad15e48
 +F src/vdbeblob.c 11248c6362389569764682eb0f59ce910f3cc381
- F src/vdbemem.c 2fc78b3e0fabcc1eaa23cd79dd2e30e6dcfe1e56
+ F src/vdbemem.c dadc7465860ad2e980f01c9b0b1ba44903249257
  F src/vdbesort.c 468d43c057063e54da4f1988b38b4f46d60e7790
- F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
+ F src/vdbetrace.c d6e50e04e1ec498150e519058f617d91b8f5c843
  F src/vtab.c e9318d88feac85be8e27ee783ac8f5397933fc8a
- F src/wal.c 9658df8d404b82e6b2d40fd05944463214e2d935
- F src/wal.h 66b40bd91bc29a5be1c88ddd1f5ade8f3f48728a
+ F src/wal.c 932f09509d70fc115a7cc3d494d6fdcb825099ed
+ F src/wal.h eaa00b9a403ddda2b56d01b7afc19ef600f9363f
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
- F src/where.c 7c85f4c93058e27100d404f0777aaeb0d1b296ae
+ F src/where.c af623942514571895818b9b7ae11db95ae3b3d88
  F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@@ -638,8 -630,8 +642,8 @@@ F test/pageropt.test 9191867ed19a2b3db6
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
- F test/permutations.test 6f650848f527507771eb8a447d5969a8d14e2040
- F test/pragma.test 1ea0c85be853135bb7468e6eed48ee12b04794d4
 -F test/permutations.test 8db6d3b72e6ce423cfb94d87926e5edcb4b0078f
++F test/permutations.test 4ec9fbb2f1389f96be8a7108a86f7f2674ae5d4b
+ F test/pragma.test 7fa35e53085812dac94c2bfcbb02c2a4ad35df5e
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
@@@ -678,10 -672,9 +684,10 @@@ F test/select7.test dad6f00f0d49728a879
  F test/select8.test 391de11bdd52339c30580dabbbbe97e3e9a3c79d
  F test/select9.test 74c0fb2c6eecb0219cbed0cbe3df136f8fbf9343
  F test/selectA.test 06d1032fa9009314c95394f2ca2e60d9f7ae8532
- F test/selectB.test 0d072c5846071b569766e6cd7f923f646a8b2bfa
+ F test/selectB.test 954e4e49cf1f896d61794e440669e03a27ceea25
  F test/selectC.test f9bf1bc4581b5b8158caa6e4e4f682acb379fb25
  F test/server1.test 46803bd3fe8b99b30dbc5ff38ffc756f5c13a118
 +F test/session.test c1a17c11ef7d01c24fe2b9f7871190d949a8e718
  F test/shared.test 34945a516532b11182c3eb26e31247eee3c9ae48
  F test/shared2.test 8f71d4eb4d5261280de92284df74172545c852cc
  F test/shared3.test ebf77f023f4bdaa8f74f65822b559e86ce5c6257
@@@ -720,7 -714,7 +727,7 @@@ F test/tclsqlite.test d5298750115768bca
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test 51edd31c65ed1560dd600b1796e8325df96318e2
  F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d
- F test/tester.tcl 8db832ad03331dcae2f39b435feb2f789cd4e8d9
 -F test/tester.tcl 001051eaf28c1040800f588a64c63e0bd0e1f36b
++F test/tester.tcl 58281fb65095d5cacb9b70f40d72bba9ff3fad34
  F test/thread001.test 7cc2ce08f9cde95964736d11e91f9ab610f82f91
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -987,7 -986,7 +999,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 8baef58170ff851d0c4387a6888f59b487b4f33c 6635cd9a7714b681dd8aa96e90be462a40d10178
- R 88557586b3e0b84a1620603b302d896a
 -P 7cf568a101cda20ab6005bd250154b7f6960193a
 -R 17a54c6dc9279f1461f74799fcc0456e
++P 23580718e1c15ddb89682d0e7566da4d7276bfe9 1378f905d37544701776d38987fe7a312b255983
++R 5ebf66e93e6aec7fb5582a0e00987618
  U drh
- Z 16ec16c4d6fe744468506e061de572a3
 -Z e2b3f0a5a9dd1fb18b07ce4e17a75f03
++Z e88b35dabf798061ce032430eb1150b1

diff --cc manifest.uuid
index 428de65f35e10c174b1473db0837b1645f534b42,e41b00255241eb191568d1bd1ef93e9a329f416f..54abe4658621a0816bae994e44d12d0a4c2597ff
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 23580718e1c15ddb89682d0e7566da4d7276bfe9
 -1378f905d37544701776d38987fe7a312b255983
++a9bcb432f58b96f079a73c456efd4851c582221e

diff --cc src/delete.c
Simple merge

diff --cc src/insert.c
Simple merge

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/test_config.c
Simple merge

diff --cc src/update.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbe.h
Simple merge

diff --cc src/vdbeInt.h
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc test/permutations.test
Simple merge

diff --cc test/tester.tcl
Simple merge