Bring the sessions branch up-to-date with all the latest trunk changes.

FossilOrigin-Name: 086a127236ee99d67513490fb7b5549e8b752c44

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 9d42d93147c58dd049194639df1ef2d5398b5e44,90d6e4c47178fa83dbb76845699f71ec1efbe932..cb4dedd6664115f5545d3281ccb880908cb66c38
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Update\sthe\ssessions\sbranch\sto\sthe\sofficial\s3.7.17\srelease\scode.
- D 2013-05-20T13:01:19.466
 -C Add\sthe\sSQLITE_STMTSTATUS_VM_STEPS\soption\sfor\ssqlite3_stmt_status().
 -D 2013-06-26T13:22:28.231
++C Bring\sthe\ssessions\sbranch\sup-to-date\swith\sall\sthe\slatest\strunk\schanges.
++D 2013-06-26T13:31:50.503
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in e4039bf51ba64e20375b375044a6582f4c27743a
 -F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
++F Makefile.in aff38bc64c582dd147f18739532198372587b0f0
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc bcba918c1bd4c9ba3d90d59954f8107ed1ffb5fb
 -F Makefile.msc 7d226394826f060f232c0a02a468e8651819b7c2
++F Makefile.msc ea294496193d9ed30137730b42ec2fc07ca5f544
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
- F VERSION 0dee4d2e0c64791ff0085277424fb5c07d79fc9a
+ F VERSION f135b651727f978b7191bd6fa12c7fc1e13e13ac
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -111,22 -135,10 +135,22 @@@ F ext/rtree/rtree_util.tcl 06aab2ed5b82
  F ext/rtree/sqlite3rtree.h c34c1e41d1ab80bb8ad09aae402c9c956871a765
  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 496291b287ba3c0b14ca2e074425e29cc92a64a6
 +F ext/session/sqlite3session.c 7d7ca693bd581243835ee47b41b491bd909a26f4
 +F ext/session/sqlite3session.h f374c9c4c96e08f67ac418871c29d423245c7673
 +F ext/session/test_session.c 23eddaf713708ae063d278ec6297652e3672dc38
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F magic.txt 3f820e18c43504b25da40ff4b4cdb66dc4c4907e
- F main.mk e1aa28b8104784696a7ca9c15d0b6c4bf156ae02
+ F magic.txt f2b23a6bde8f1c6e86b957e4d94eab0add520b0d
 -F main.mk c4335dbdb004d37e00e23d6ff226e55df0db5b21
++F main.mk f045701c66fec66208bc35d79de372340916e81e
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -158,11 -170,11 +182,11 @@@ F src/callback.c d7e46f40c3cf53c43550b7
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 4262c227bc91cecc61ae37ed3a40f08069cfa267
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
 -F src/delete.c aeabdabeeeaa0584127f291baa9617153d334778
 +F src/delete.c 39a770e9729b1acd2de347f8f614584841d0083e
- F src/expr.c e40d198a719aba1d2514f6e1541f9154f976ceb6
+ F src/expr.c 2b47ae9da6c9f34eff6736962ea2e102c6c4a755
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c e16942bd5c8a868ac53287886464a5ed0e72b179
- F src/func.c d3fdcff9274bc161152e67ed3f626841c247f4b9
+ F src/func.c 5c50c1ea31fd864b0fe921fe1a8d4c55acd609ef
  F src/global.c 5caf4deab621abb45b4c607aad1bd21c20aac759
  F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
@@@ -172,7 -184,7 +196,7 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c c48f7f3f170e502fe0cc20748e03c6e0b5a016c2
- F src/main.c 457e5db78d5ed7c6ca776c9dae3d1a36be224ec9
 -F src/main.c f33742ab539602cf18becc6a85ecef164706c86a
++F src/main.c 55347b3785f59939ddccfa22ea2bd5bd4acc7a13
  F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
@@@ -203,17 -215,17 +227,17 @@@ F src/printf.c bff529ed47657098c55c9910
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 89f9003e8316ee3a172795459efc2a0274e1d5a8
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c a4641882279becc200f2680f55f3e89d4e7c7f78
- F src/shell.c 2109d54f67c815a100abd7dc6a6e25eddb3b97eb
- F src/sqlite.h.in 3b9c6d8e5b3b93e39c266c9534369042c14e9a31
+ F src/select.c 91b62654caf8dfe292fb8882715e575d34ad3874
+ F src/shell.c a02544af6697c5782d29ec3204616f35ed9e8458
 -F src/sqlite.h.in 5f86553f4c1d8b4a9069285ed19e7981451ea77a
++F src/sqlite.h.in d4abdfeea75b91d505998e14c6b98b240ce4eb31
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h d936f797812c28b81b26ed18345baf8db28a21a5
- F src/sqliteInt.h 2b53aa18b83979ea2a63eda9faae32e390f9a23d
 -F src/sqliteInt.h e6f069b07fdef1ab54034940b7a6e7be2b4efd57
++F src/sqliteInt.h e92a2e1b8154da9c5fc4b677a3e46644e5885b2b
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c c21f61c56d519b4bcc0dcf453953edba69266854
- F src/test1.c 045d45a4f7eeb5d963f8fc150339f1bad279011a
 -F src/tclsqlite.c b8835978e853a89bf58de88acc943a5ca94d752e
++F src/tclsqlite.c e0eaf3a78eca2ef650abb67b6571cc86abcb5f87
+ F src/test1.c 06bd01f7795bbef4aaf59d3b9fe5b3131a6ef642
  F src/test2.c 7355101c085304b90024f2261e056cdff13c6c35
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -259,19 -271,19 +283,19 @@@ F src/test_vfs.c 8e6087a8b3dcc260282074
  F src/test_vfstrace.c 34b544e80ba7fb77be15395a609c669df2e660a2
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 1e86210d3976717a19238ea7b047fac481fe8c12
- F src/trigger.c cd95ac64efa60e39faf9b5597443192ff27a22fa
- F src/update.c 2f6de22ac39150695b2219194ad47c9b6a211032
+ F src/trigger.c 5c0ea9b8755e7c5e1a700f3e27ac4f8d92dd221e
 -F src/update.c 8e76c3d03e4b7b21cb250bd2df0c05e12993e577
++F src/update.c 19daebf6a0a67af5524913e93498d08388792128
  F src/utf.c 8d819e2e5104a430fc2005f018db14347c95a38f
  F src/util.c f566b5138099a2df8533b190d0dcc74b7dfbe0c9
  F src/vacuum.c ddf21cc9577c4cb459d08bee9863a78ec000c5bb
- F src/vdbe.c 349798f630ce49c2e21a6c30863f195c484cfec5
 -F src/vdbe.c af2bc360189ce8eaed47133037e082a1652bc4a0
 -F src/vdbe.h b52887278cb173e66188da84dfab216bea61119d
 -F src/vdbeInt.h b8a76f7b7304abfdb8e6bd286eba954ecfe73863
 -F src/vdbeapi.c 0b2c78797058c6c9bfa1687977de039566e22877
 -F src/vdbeaux.c af9cd9372c7ab82294b9645723e652c2d4213b95
 -F src/vdbeblob.c 5dc79627775bd9a9b494dd956e26297946417d69
++F src/vdbe.c 45a342e1bf84cab8f6c42effeb97a11c9e58cfe4
 +F src/vdbe.h 1223e2548e0970cf96f573ff6b99f804a36ad683
- F src/vdbeInt.h a6b7a1fbb2b335fd8c3b4b8a696b1ba28eae2191
- F src/vdbeapi.c 5899f359cb51c6949aeff50a806275c94fe73fce
- F src/vdbeaux.c 426263e901f19d8fe6bc7124ee5dafc78a2feac3
++F src/vdbeInt.h cbecb801377541cd84f7720c77ed28e38e454204
++F src/vdbeapi.c 4c5da2026196e49dbeb6f9d2aa37ab0165887617
++F src/vdbeaux.c a0418e1eefa31cd52af0e2a1b1444cc01c65356e
 +F src/vdbeblob.c 1268e0bcb8e21fa32520b0fc376e1bcdfaa0c642
  F src/vdbemem.c 833005f1cbbf447289f1973dba2a0c2228c7b8ab
- F src/vdbesort.c 4fad64071ae120c25f39dcac572d716b9cadeb7f
+ F src/vdbesort.c 3937e06b2a0e354500e17dc206ef4c35770a5017
  F src/vdbetrace.c 18cc59cb475e6115129bfde224367d13a35a7d13
  F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
  F src/wal.c 436bfceb141b9423c45119e68e444358ee0ed35d
@@@ -548,9 -563,9 +575,9 @@@ F test/fuzz2.test 207d0f9d06db3eaf47a6b
  F test/fuzz3.test aec64345184d1662bd30e6a17851ff659d596dc5
  F test/fuzz_common.tcl a87dfbb88c2a6b08a38e9a070dabd129e617b45b
  F test/fuzz_malloc.test 328f70aaca63adf29b4c6f06505ed0cf57ca7c26
- F test/fuzzer1.test 41bd5aa6ae0cf18d06342a4476e3cad98604ae48
+ F test/fuzzer1.test d4c52aaf3ef923da293a2653cfab33d02f718a36
  F test/fuzzerfault.test 8792cd77fd5bce765b05d0c8e01b9edcf8af8536
 -F test/hook.test 45cb22b940c3cc0af616ba7430f666e245711a48
 +F test/hook.test 777b2541f6dd4f4ca5e8d6b66c1df1b3717aeab6
  F test/icu.test 70df4faca133254c042d02ae342c0a141f2663f4
  F test/in.test 5941096407d8c133b9eff15bd3e666624b6cbde3
  F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
@@@ -691,7 -708,8 +720,8 @@@ F test/pageropt.test 6b8f6a123a5572c195
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
- F test/permutations.test 40df92601e0874e8026c7fdb50609b095f9f05a9
+ F test/percentile.test 4614301e38398df7fdd5f28f4ed8f272b328251b
 -F test/permutations.test 461ef4ea10db02cd421dfe5f988eac3e99b5cd9a
++F test/permutations.test 17f03ab6fc174c910c6eb86761d5ba60b93ad3b5
  F test/pragma.test 5e7de6c32a5d764f09437d2025f07e4917b9e178
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
@@@ -792,7 -809,7 +822,7 @@@ F test/tclsqlite.test a7308276aad2e6c0b
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d
- F test/tester.tcl c6dc3ea5b906b3665ab52c82c72237268adf506d
 -F test/tester.tcl 63b24679c75a952c51f924de2802b2b57cddd22d
++F test/tester.tcl eea7b3220ca0dd4b49736dfad48c9b867aa58b46
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1077,8 -1095,9 +1108,9 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
+ F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P af8057ef5dcaa72dc0d2ab5d1553b06757449fa1 118a3b35693b134d56ebd780123b7fd6f1497668
- R 761a8ed22a8749120c73e2864c0eb686
 -P 6505e2ab0200736c525b5cfcf1cb62c0bd4d18ee f1366bab737a3ac2ea20a0ec014cc306d7ded8a5
 -R f18ef17a1aa4ad99e11ed462c222b226
++P fc88f7311ba888015634b89b5909890208f543f5 bd4267f17bbf5d01fb3f12a5a06e94fcbcbd785c
++R fbcf046d813fd5b4194215d3a88e6121
  U drh
- Z 4eb33f364939c46f6449b3e37e7ba2f3
 -Z 6991e339422447eb9d48847676d4d2d7
++Z 65f93ab590b102a4bb6eff5ef529fe8b

diff --cc manifest.uuid
index e58bc6828eed121ea22b6a554dc080cf3975c694,95968b011172c6fbfbd044b89ff408142747bed9..bb570b6c5dcaf222a85b2a416027aae37361ac1d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fc88f7311ba888015634b89b5909890208f543f5
 -bd4267f17bbf5d01fb3f12a5a06e94fcbcbd785c
++086a127236ee99d67513490fb7b5549e8b752c44

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/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