Merge the changes for the 3.7.16.1 release candidate into the sessions branch.

FossilOrigin-Name: ee35a89712b8ea9f4e70d61a29150348896b519f

diff --cc configure
Simple merge

diff --cc manifest
index d3b33519de373227cf2cb808e53eec199750287e,dc96b26eeee5452268d43e58e7ce75f8e5a05071..0c1f9bd6b68033dd769ed875948a0b757e2553f0
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Also\sexport\sthe\ssqlite3changeset\sinterfaces\sin\sthe\samalgamated\sversion\sof\nthe\ssessions\sextension.
- D 2013-03-19T17:10:10.376
 -C Fix\sharmless\scompiler\swarnings\scoming\sfrom\sMSVC64\sin\stest\scode.\s\sNo\nchanges\sto\sthe\score.
 -D 2013-03-27T20:41:15.391
++C Merge\sthe\schanges\sfor\sthe\s3.7.16.1\srelease\scandidate\sinto\sthe\ssessions\sbranch.
++D 2013-03-28T01:19:26.359
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in df3e48659d80e1b7765785d8d66c86b320f72cc7
 +F Makefile.in 174bfca74e57f38699e3412a984f6b38106750fa
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 0c1abc21c8deefc88e8a32ad6a07e5f96e158761
 +F Makefile.msc 0ad7d4278a3b7e0c56d3ca7cc607b34acc1df516
  F Makefile.vxworks b18ad88e9a8c6a001f5cf4a389116a4f1a7ab45f
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
- F VERSION 6d4f66eaebabc42ef8c2a4d2d0caf4ce7ee81137
+ F VERSION 05604ccde96fe1b37f922eddbdcb5654308261db
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -15,7 -15,7 +15,7 @@@ F art/sqlite370.jpg d512473dae7e378a67e
  F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
  F config.h.in 0921066a13130082764ab4ab6456f7b5bebe56de
  F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
- F configure 5f2564ac77bef7db2484083452b011822a02d515 x
 -F configure 2f9994fd2e2005753809a2246c7a0816c80b2d2f x
++F configure 95daaa3491af6a63fdd0b99bd78b8b04fb9f8303 x
  F configure.ac 81c43d151d0b0e406be056394cc9ff4cb3fd0444
  F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
  F doc/lemon.html 334dbf6621b8fb8790297ec1abf3cfa4621709d1
@@@ -128,34 -116,34 +128,34 @@@ F sqlite3.1 6be1ad09113570e1fc8dcaff84c
  F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
  F src/alter.c f8db986c03eb0bfb221523fc9bbb9d0b70de3168
  F src/analyze.c d5f895810e8ff9737c9ec7b76abc3dcff5860335
- F src/attach.c ea5247f240e2c08afd608e9beb380814b86655e1
+ F src/attach.c 1816f5a9eea8d2010fc2b22b44f0f63eb3a62704
  F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
  F src/backup.c b2cac9f7993f3f9588827b824b1501d0c820fa68
- F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1
+ F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c 746c4dafae8565b3be6fb9ce3bb1fa9f1e67cc59
+ F src/btree.c 62ba5954765efc711c873a20a53f60d9fc2843ba
  F src/btree.h 3ad7964d6c5b1c7bff569aab6adfa075f8bf06cd
  F src/btreeInt.h eecc84f02375b2bb7a44abbcbbe3747dde73edb2
- F src/build.c 375e5df716e03b9343c5e1211be3b24e6d6dff05
+ F src/build.c 083da8466fd7e481cb8bd5264398f537507f6176
  F src/callback.c d7e46f40c3cf53c43550b7da7a1d0479910b62cc
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
- F src/ctime.c 72a70dcfda75d3a1f81041ce4573e7afddcd8e4e
+ F src/ctime.c 2a5f251fcd7393808df77ccfc817e7058df08c4c
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
 -F src/delete.c aeabdabeeeaa0584127f291baa9617153d334778
 +F src/delete.c 39a770e9729b1acd2de347f8f614584841d0083e
- F src/expr.c d488bb60e54c9305d9fca1fa6fcc7bfbd23b13a2
+ F src/expr.c 48048fca951eedbc74aa32262154410d56c83812
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c e16942bd5c8a868ac53287886464a5ed0e72b179
  F src/func.c 48987c025d69399f59a1c2a553cea5da41bf105d
  F src/global.c e59ecd2c553ad0d4bfbc84ca71231336f8993a7a
  F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
- F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
+ F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
 -F src/insert.c f7cb141e8ce257cb6b15c497f09e4e23d6055599
 +F src/insert.c 02f8a1867088cb654eb756f98389f10441a65216
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c 1422eba4aa2b1fb5f7b3aef574752272477d21e2
- F src/main.c 40097dfb4844b9272dc45926a73cd9b01a1bd137
 -F src/main.c 379160ec3680e3009aa4978eac47027c3ef27ac5
++F src/main.c 557e456f41646c67ccfe3dae3fa945b5bfb788c5
  F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
@@@ -186,16 -174,16 +186,16 @@@ F src/printf.c 4a9f882f1c1787a8b494a298
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 9079da7d59aed2bb14ec8315bc7f720dd85b5b65
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c e1c6f6abdf9f359f4e735cb8ae11d2f359bf52a9
+ F src/select.c 01540bcd3df3c8f1187158e77986028b1c667258
  F src/shell.c 7c41bfcd9e5bf9d96b9215f79b03a5b2b44a3bca
- F src/sqlite.h.in 095fc633527cb18e5196ea5adc31370dc6aa389e
 -F src/sqlite.h.in 8d9e83d965f364ff99ebf4b653d0683d05df3900
++F src/sqlite.h.in ba60664eedbe33fb5f68f17b4cbbcd59af8fc6ad
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 7183ab832e23db0f934494f16928da127a571d75
 -F src/sqliteInt.h 0f8f05ee4db4ba9120b38f7a3992b325698f6e8a
 +F src/sqliteInt.h a0a6b155f5e9748dfb5876d892e03a07eb056d7b
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c bc021495cad081c13ccdcebd524857aedd831e11
 -F src/tclsqlite.c 9a716c737590d2f129d71c8fc7065e5aba0e7222
++F src/tclsqlite.c a15550a334ca07ac2bc5d32c5f97e3d61be886e8
  F src/test1.c ff3e68eedfbd858c9b89cf03e3db233cd29be1d0
  F src/test2.c 4178056dd1e7d70f954ad8a1e3edb71a2a784daf
  F src/test3.c 3c3c2407fa6ec7a19e24ae23f7cb439d0275a60d
@@@ -209,10 -197,10 +209,10 @@@ F src/test_async.c 0612a752896fad42d55c
  F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
  F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de
  F src/test_btree.c 5b89601dcb42a33ba8b820a6b763cc9cb48bac16
- F src/test_config.c 1ffddfdfa5a73e7fb497e8c89c22754bbc949c81
 -F src/test_config.c ab6605a41f2020912d5e44b8dd4b9fb21bd75ac0
++F src/test_config.c 8437cba146aa12c2fddfa5d1a73eb4f5fe0ee8e6
  F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
- F src/test_fs.c 1c51e203b2c20235d8c3739f8c1fb13a7502915b
+ F src/test_fs.c 8f786bfd0ad48030cf2a06fb1f050e9c60a150d7
  F src/test_func.c 3a8dd37c08ab43b76d38eea2836e34a3897bf170
  F src/test_fuzzer.c 1d26aa965120420bc14807da29d4d4541bfa6148
  F src/test_hexio.c abfdecb6fa58c354623978efceb088ca18e379cd
@@@ -247,18 -235,18 +247,18 @@@ F src/test_wholenumber.c 3d2b9ed1505c40
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 1e86210d3976717a19238ea7b047fac481fe8c12
  F src/trigger.c cd95ac64efa60e39faf9b5597443192ff27a22fa
- F src/update.c abb0fcabe551dae0a133fd2a4370b5a8c23b1831
 -F src/update.c a2a5631d618cbe240fc83725fa9e95c56ae0084c
++F src/update.c beef58f5fd66153ac9cdf6e9f6551f09ee68976c
  F src/utf.c 8d819e2e5104a430fc2005f018db14347c95a38f
- F src/util.c 0af2e515dc0dabacec931bca39525f6c3f1c5455
+ F src/util.c 550f2b6a5c0085153a4d00462719fb17ee242792
  F src/vacuum.c 2727bdd08847fcb6b2d2da6d14f018910e8645d3
- F src/vdbe.c 9e4164ac85aa01e1a563e6c7f565b106ff0bf67b
 -F src/vdbe.c 1d56617d816098a41bdbe73536a67dcdefad52bd
 -F src/vdbe.h b52887278cb173e66188da84dfab216bea61119d
 -F src/vdbeInt.h 3bb8531d6768379f086e1576b31d52331f6eb982
 -F src/vdbeapi.c 56f9ad6329d093f54b5dd321a2b4a643f89a6cb6
 -F src/vdbeaux.c ecb43014bcd3019e5aa2b5561e5c3a447f007a08
 -F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
++F src/vdbe.c fee31825a8e287bb6ed2dacc33fb276c5e2ab7a5
 +F src/vdbe.h 1223e2548e0970cf96f573ff6b99f804a36ad683
- F src/vdbeInt.h 0112cab1c820a599005c6bcc9504bdb17f5dbcdb
- F src/vdbeapi.c b816227ece97354aee7a741c1fc3c5445202d8bb
- F src/vdbeaux.c b49b277bcac5ac1e14165f13b7cd320b5333f420
++F src/vdbeInt.h bd76014fa5051b9f33223e4cc6a76d00ce031944
++F src/vdbeapi.c 8245e8c2cdcf105871a4ccae365d3bd29bfca6d1
++F src/vdbeaux.c 426263e901f19d8fe6bc7124ee5dafc78a2feac3
 +F src/vdbeblob.c 11248c6362389569764682eb0f59ce910f3cc381
  F src/vdbemem.c 833005f1cbbf447289f1973dba2a0c2228c7b8ab
- F src/vdbesort.c c61ca318681c0e7267da8be3abfca8469652a7e9
+ F src/vdbesort.c 4fad64071ae120c25f39dcac572d716b9cadeb7f
  F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835
  F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
  F src/wal.c f5c7b5027d0ed0e9bc9afeb4a3a8dfea762ec7d2
@@@ -762,11 -751,11 +764,11 @@@ F test/syscall.test bea9bf329bff733c791
  F test/sysfault.test c79441d88d23696fbec7b147dba98d42a04f523f
  F test/table.test a59d985ca366e39b17b175f387f9d5db5a18d4e2
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
 -F test/tclsqlite.test 37a61c2da7e3bfe3b8c1a2867199f6b860df5d43
 +F test/tclsqlite.test a7308276aad2e6c0bfb5b0414424dd0d9cc0cad7
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
- F test/temptable.test 51edd31c65ed1560dd600b1796e8325df96318e2
+ F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d
- F test/tester.tcl a59fdc17860da8590988352ae4ba0dadf4266e10
 -F test/tester.tcl 0d95028653ad6782e17400b7a32a046b87c67a48
++F test/tester.tcl 4201c6efa80693e5414d4f241bb0f325a124478f
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1051,7 -1041,7 +1054,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P ec490336bc6629d3910667ece1bbc4685a199546
- R feb292609e6100e1f2edd6a494c7d523
 -P 7e32eb7b66290ba7323520f7ea92ffa584ee7193
 -R 146cc38cc60deb4264a54dc6e7f5cc2c
++P 5b399f2bc43612c52ea2289001d852d7ba6f9750 274d2a22660c7b34b8bbd85f3c29cbafbcb1b4e7
++R b02a4b1d8d4060ecab7247b46b1af3cb
  U drh
- Z 6c74b8c2b0cc569ec1ecb44db9287f05
 -Z 01cce950cabd5af1f79f5298131f812c
++Z 8200523e839d9fbff750764d761a16eb

diff --cc manifest.uuid
index 69c2acc8d3f4ce774fc54a064decc3e4d5e8a443,005d2f5c5842a56fe431e1261bba7bcb13d1a55c..1cd07d64762194eeb7c4f1c3ba8cb0f13ed4b17a
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5b399f2bc43612c52ea2289001d852d7ba6f9750
 -274d2a22660c7b34b8bbd85f3c29cbafbcb1b4e7
++ee35a89712b8ea9f4e70d61a29150348896b519f

diff --cc src/main.c
Simple merge

diff --cc src/sqlite.h.in
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/vdbeInt.h
index 676ac8d07a2085da408f9dc419ae8a8a008919f9,2372b838493d81c38234d0a2540e345dadd86ad1..b871b25daeeb7ef05e5a8050309ec194d873d6b7
--- 1/src/vdbeInt.h
--- 2/src/vdbeInt.h
+++ b/src/vdbeInt.h
@@@ -446,19 -427,8 +446,10 @@@ int sqlite3VdbeCloseStatement(Vdbe *, i
  void sqlite3VdbeFrameDelete(VdbeFrame*);
  int sqlite3VdbeFrameRestore(VdbeFrame *);
  void sqlite3VdbeMemStoreType(Mem *pMem);
 +void sqlite3VdbePreUpdateHook(
 +    Vdbe *, VdbeCursor *, int, const char*, Table *, i64, int);
  int sqlite3VdbeTransferError(Vdbe *p);
  
- #ifdef SQLITE_OMIT_MERGE_SORT
- # define sqlite3VdbeSorterInit(Y,Z)      SQLITE_OK
- # define sqlite3VdbeSorterWrite(X,Y,Z)   SQLITE_OK
- # define sqlite3VdbeSorterClose(Y,Z)
- # define sqlite3VdbeSorterRowkey(Y,Z)    SQLITE_OK
- # define sqlite3VdbeSorterRewind(X,Y,Z)  SQLITE_OK
- # define sqlite3VdbeSorterNext(X,Y,Z)    SQLITE_OK
- # define sqlite3VdbeSorterCompare(X,Y,Z) SQLITE_OK
- #else
  int sqlite3VdbeSorterInit(sqlite3 *, VdbeCursor *);
  void sqlite3VdbeSorterClose(sqlite3 *, VdbeCursor *);
  int sqlite3VdbeSorterRowkey(const VdbeCursor *, Mem *);

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc test/tester.tcl
Simple merge